From patchwork Mon Feb 3 12:01:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 235812 List-Id: U-Boot discussion From: festevam at gmail.com (Fabio Estevam) Date: Mon, 3 Feb 2020 09:01:08 -0300 Subject: [PATCH v2 1/2] mx7ulp: Remove duplicated definitions Message-ID: <20200203120109.11287-1-festevam@gmail.com> These PMC0 definitions are already defined in the beginning of the file, so remove the duplication. Reported-by: Stefano Babic Signed-off-by: Fabio Estevam Reviewed-by: Peng Fan --- Changes since v1: - Newly introduced in this version. arch/arm/mach-imx/mx7ulp/soc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 46484813d2..d8d691692c 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -193,10 +193,6 @@ const char *get_imx_type(u32 imxtype) return "7ULP"; } -#define PMC0_BASE_ADDR 0x410a1000 -#define PMC0_CTRL 0x28 -#define PMC0_CTRL_LDOEN BIT(31) - static bool ldo_mode_is_enabled(void) { unsigned int reg; From patchwork Mon Feb 3 12:01:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 235813 List-Id: U-Boot discussion From: festevam at gmail.com (Fabio Estevam) Date: Mon, 3 Feb 2020 09:01:09 -0300 Subject: [PATCH v2 2/2] mx7ulp: Only enable LDO if it is not already enabled In-Reply-To: <20200203120109.11287-1-festevam@gmail.com> References: <20200203120109.11287-1-festevam@gmail.com> Message-ID: <20200203120109.11287-2-festevam@gmail.com> LDO mode may be already enabled by the ROM and enabling it again can cause U-Boot to hang. Avoid this problem by only enabling LDO mode if it is initially disabled. Reported-by: Jorge Ramirez-Ortiz Signed-off-by: Fabio Estevam Tested-by: Jorge Ramirez-Ortiz Reviewed-by: Peng Fan --- Changes since v1: - Drop the define changes as they are duplicated (Stefano). arch/arm/mach-imx/mx7ulp/soc.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index d8d691692c..0d39dab7ea 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -118,12 +118,26 @@ void init_wdog(void) disable_wdog(WDG2_RBASE); } +static bool ldo_mode_is_enabled(void) +{ + unsigned int reg; + + reg = readl(PMC0_BASE_ADDR + PMC0_CTRL); + if (reg & PMC0_CTRL_LDOEN) + return true; + else + return false; +} + #if !defined(CONFIG_SPL) || (defined(CONFIG_SPL) && defined(CONFIG_SPL_BUILD)) #if defined(CONFIG_LDO_ENABLED_MODE) static void init_ldo_mode(void) { unsigned int reg; + if (ldo_mode_is_enabled()) + return; + /* Set LDOOKDIS */ setbits_le32(PMC0_BASE_ADDR + PMC0_CTRL, PMC0_CTRL_LDOOKDIS); @@ -193,17 +207,6 @@ const char *get_imx_type(u32 imxtype) return "7ULP"; } -static bool ldo_mode_is_enabled(void) -{ - unsigned int reg; - - reg = readl(PMC0_BASE_ADDR + PMC0_CTRL); - if (reg & PMC0_CTRL_LDOEN) - return true; - else - return false; -} - int print_cpuinfo(void) { u32 cpurev;