From b4f0b1401c18e020625d4cb24a02d57b55a5219d Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Fri, 30 Aug 2013 14:15:28 +0800 Subject: ENGR00276023-3: ARM: mx6: enable ldo bypass check on mx6 board Enable ldo bypass check on mx6 and get fdt->blob from 'fdt_addr' which contained the right fdt. Signed-off-by: Robin Gong --- arch/arm/cpu/armv7/mx6/soc.c | 4 ++++ include/configs/mx6_common.h | 1 + include/configs/mx6slevk.h | 1 + 3 files changed, 6 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 26279bf..79788b9 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -453,6 +453,10 @@ int check_ldo_bypass(void) { int ret = 0; int node; + + /* get the right fdt_addr */ + gd->fdt_blob = (void *)getenv_ulong("fdt_addr", 16, + (uintptr_t)gd->fdt_blob); /* Get the node from FDT for anatop ldo-bypass */ node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "fsl,imx6q-gpc"); diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 674bcd3..95f912d 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -20,5 +20,6 @@ #define CONFIG_ARM_ERRATA_742230 #define CONFIG_ARM_ERRATA_743622 #define CONFIG_ARM_ERRATA_751472 +#define CONFIG_LDO_BYPASS_CHECK #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index d8eedb0..48cace6 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -18,6 +18,7 @@ #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_LDO_BYPASS_CHECK #define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0x00A02000 -- cgit v1.1