Skip to contentSkip to conversation

mx7ulp: Remove duplicated definitions

PATCH New Fabio Estevam 3 participants 7 messages Feb 3, 2020 – Apr 18, 2020

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 mx7ulp: Remove duplicated definitions

These PMC0 definitions are already defined in the beginning of the file, so remove the duplication.

---
Changes since v1:
- Newly introduced in this version.

 arch/arm/mach-imx/mx7ulp/soc.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/mach-imx/mx7ulp/soc.c +0 -4
index 46484813d2..d8d691692c 100644
@@ -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;
Signature · 1 line
2.17.1
author reviewer
#1 lore raw

PATCH v2 2/2 mx7ulp: Only enable LDO if it is not already enabled

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.

---
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(-)
arch/arm/mach-imx/mx7ulp/soc.c +14 -11
index d8d691692c..0d39dab7ea 100644
@@ -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;
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/2 mx7ulp: Only enable LDO if it is not already enabled

Quoted 10 lines

Subject: [PATCH v2 2/2] mx7ulp: Only enable LDO if it is not already enabled

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.

Just have a question, LDO mode enabled by ROM, this is configured with fuse?

Is there any special configuration need to be done in Linux? I not touch this part before (:

Thanks,
Peng.

Quoted 58 lines

---
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(-)
(quoted diff) +0 -0

b/arch/arm/mach-imx/mx7ulp/soc.c index d8d691692c..0d39dab7ea 100644

arch/arm/mach-imx/mx7ulp/soc.c +14 -12
@@ -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;
--

2.17.1

author reviewer
#3 lore raw

PATCH v2 2/2 mx7ulp: Only enable LDO if it is not already enabled

Hi Peng,

Quoted 1 line · Peng Fan

Just have a question, LDO mode enabled by ROM, this is configured with fuse?

I looked at the fuse map and did not see a fuse that controls it.

Quoted 2 lines

Is there any special configuration need to be done in Linux? I not touch this part before (:

In LDO-enabled mode cpufreq needs to be disabled.

Please see:
https://github.com/fabioestevam/linux-imx/commit/8d66e5aae5b32261c9e2757c3844438c98ed0dfe

The reason is that in LDO-enabled mode only RUN mode at 500MHz is supported.

HSRUN at 720MHz is not supported in LDO-enabled mode, so ROM boots at 500MHz and kernel keeps always running at this frequency.

Regards,

Fabio Estevam

Quoted 63 lines

Thanks,
Peng.

Quoted 58 lines

---
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(-)
(quoted diff) +0 -0

b/arch/arm/mach-imx/mx7ulp/soc.c index d8d691692c..0d39dab7ea 100644

arch/arm/mach-imx/mx7ulp/soc.c +14 -12
@@ -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;
--

2.17.1

#4 lore raw

PATCH v2 2/2 mx7ulp: Only enable LDO if it is not already enabled

In reply to Fabio Estevam
Quoted 7 lines

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.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH v2 1/2 mx7ulp: Remove duplicated definitions

In reply to Fabio Estevam
Quoted 7 lines

Subject: [PATCH v2 1/2] mx7ulp: Remove duplicated definitions

These PMC0 definitions are already defined in the beginning of the file, so remove the duplication.

Quoted 24 lines

---
Changes since v1:
- Newly introduced in this version.

 arch/arm/mach-imx/mx7ulp/soc.c | 4 ----
 1 file changed, 4 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-imx/mx7ulp/soc.c index 46484813d2..d8d691692c 100644

arch/arm/mach-imx/mx7ulp/soc.c +0 -5
@@ -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;
--

2.17.1

#6 lore raw

PATCH v2 1/2 mx7ulp: Remove duplicated definitions

In reply to Fabio Estevam
Quoted 5 lines

These PMC0 definitions are already defined in the beginning of the file, so remove the duplication.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================