highbank: add of fixup
cover highbank: add of fixup
Hi,
On highbank we need to disabled the sata or the mmc based on teh power domain and update the cpu informations
The following changes since commit 03df05df8265f287c142319553a7225b973714fb:
of: add do_fixup_by_compatible with u32 and string version (2013-02-15 22:27:24 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git delivery/highbank
for you to fetch changes up to a289534ee9cd1e75ac67317a2e8693ea53c679de:
highbank: add of fixup (2013-02-15 22:27:29 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
highbank: move register value to include/mach
highbank: add of fixup
arch/arm/boards/highbank/init.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
arch/arm/mach-highbank/core.c | 7 +++----
arch/arm/mach-highbank/include/mach/hardware.h | 14 ++++++++++++++
arch/arm/mach-highbank/{ => include/mach}/sysregs.h | 5 +++++
arch/arm/mach-highbank/reset.c | 3 +--
5 files changed, 70 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/mach-highbank/include/mach/hardware.h
rename arch/arm/mach-highbank/{ => include/mach}/sysregs.h (90%)Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/2 highbank: move register value to include/mach
so the board can use it
---
arch/arm/mach-highbank/core.c | 7 +++----
arch/arm/mach-highbank/include/mach/hardware.h | 14 ++++++++++++++
arch/arm/mach-highbank/{ => include/mach}/sysregs.h | 0
arch/arm/mach-highbank/reset.c | 3 +--
4 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 arch/arm/mach-highbank/include/mach/hardware.h
rename arch/arm/mach-highbank/{ => include/mach}/sysregs.h (100%)arch/arm/mach-highbank/core.c +3 -4
@@ -15,11 +15,10 @@#include <asm/hardware/arm_timer.h> #include <mach/devices.h> +#include <mach/hardware.h> +#include <mach/sysregs.h> -#include "sysregs.h" - -void __iomem *sregs_base =IOMEM (0xfff3c00 ); - +void __iomem *sregs_base =IOMEM (HB_SREG_A9_BASE );static void highbank_clk_init (void ) {
arch/arm/mach-highbank/include/mach/hardware.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* Copyright (C) 2010-2011 Calxeda, Inc +* Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* GPLv2 only +*/ + +#ifndef __MACH_HARDWARE_H__ +#define __MACH_HARDWARE_H__ + +#define HB_SREG_A9_BASE 0xfff3c000 +#define HB_SYSRAM_OPP_TABLE_BASE 0xfff8f000 + +#endif /* __MACH_HARDWARE_H__ */
arch/arm/mach-highbank/include/mach/sysregs.h renamed from arch/arm/mach-highbank/sysregs.h +0 -0
arch/arm/mach-highbank/reset.c +1 -2
@@ -8,8 +8,7 @@#include <io.h> #include <mach/devices.h> - -#include "sysregs.h" +#include <mach/sysregs.h> void __noreturn reset_cpu (ulong addr) {
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 highbank: add of fixup
depending on the power domain register we need to disable sata or mmc and update the cpu informations
take from Calxeda U-Boot git
Register the original dtb to /dev/firmware-dtb and the fixed dtb to /dev/dtb
--- arch/arm/boards/highbank/init.c | 48 ++++++++++++++++++++++++- arch/arm/mach-highbank/include/mach/sysregs.h | 5 +++ 2 files changed, 52 insertions(+), 1 deletion(-)
arch/arm/boards/highbank/init.c +47 -1
@@ -10,15 +10,57 @@#include <asm/system_info.h> #include <generated/mach-types.h> #include <mach/devices.h> +#include <mach/hardware.h> +#include <mach/sysregs.h> #include <environment.h> #include <partition.h> #include <sizes.h> #include <io.h> +#include <libfdt.h> #define FIRMWARE_DTB_BASE 0x1000 +#define HB_OPP_VERSION 0 +struct fdt_header *fdt =NULL ; +static int hb_fixup (struct fdt_header *fdt) +{ +u32 reg =readl (sregs_base +HB_SREG_A9_PWRDOM_DATA ); +u32 *opp_table = (u32 *)HB_SYSRAM_OPP_TABLE_BASE ; +u32 dtb_table[2 *10 ]; +u32 i; +u32 num_opps; +__be32 latency; + +if (!(reg &HB_PWRDOM_STAT_SATA )) +do_fixup_by_compatible_string (fdt,"calxeda,hb-ahci" ,"status" , +"disabled" ,1 ); + +if (!(reg &HB_PWRDOM_STAT_EMMC )) +do_fixup_by_compatible_string (fdt,"calxeda,hb-sdhci" ,"status" , +"disabled" ,1 ); + +if ((opp_table[0 ] >>16 ) !=HB_OPP_VERSION ) +return 0 ; + + num_opps = opp_table[0 ] &0xff ; + +for (i =0 ; i < num_opps; i++) { + dtb_table[2 * i] =cpu_to_be32 (opp_table[3 +3 * i]); + dtb_table[2 * i +1 ] =cpu_to_be32 (opp_table[2 +3 * i]); + } + + latency =cpu_to_be32 (opp_table[1 ]); + +fdt_find_and_setprop (fdt,"/cpus/cpu@0" ,"transition-latency" , + &latency,4 ,1 ); +fdt_find_and_setprop (fdt,"/cpus/cpu@0" ,"operating-points" , + dtb_table,8 * num_opps,1 ); + +return 0 ; +} +static int highbank_mem_init (void ) {struct device_node *np;
@@ -57,6 +99,7 @@ mem_initcall(highbank_mem_init);static int highbank_devices_init (void ) { +of_register_fixup (hb_fixup);if (!fdt) {highbank_register_gpio (0 );highbank_register_gpio (1 );
@@ -66,7 +109,10 @@ static int highbank_devices_init(void)highbank_register_xgmac (0 );highbank_register_xgmac (1 ); }else { -devfs_add_partition ("ram0" ,FIRMWARE_DTB_BASE ,SZ_64K ,DEVFS_PARTITION_FIXED ,"dtb" ); + fdt =of_get_fixed_tree (fdt); +add_mem_device ("dtb" , (unsigned long )fdt,fdt_totalsize (fdt), +IORESOURCE_MEM_WRITEABLE ); +devfs_add_partition ("ram0" ,FIRMWARE_DTB_BASE ,SZ_64K ,DEVFS_PARTITION_FIXED ,"firmware-dtb" ); }armlinux_set_bootparams ((void *)(0x00000100 ));
arch/arm/mach-highbank/include/mach/sysregs.h +5 -0
@@ -23,6 +23,11 @@ extern void __iomem *sregs_base;#define HB_SREG_A9_PWR_REQ 0xf00#define HB_SREG_A9_BOOT_STAT 0xf04#define HB_SREG_A9_BOOT_DATA 0xf08 +#define HB_SREG_A9_PWRDOM_DATA 0xf20 + +#define HB_PWRDOM_STAT_SATA 0x80000000 +#define HB_PWRDOM_STAT_PCI 0x40000000 +#define HB_PWRDOM_STAT_EMMC 0x20000000#define HB_PWR_SUSPEND 0#define HB_PWR_SOFT_RESET 1
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox