[U-Boot,3/7] mx7ulp: Remove the _RUN notation from the PMC1 LDOVL definitions
diff mbox series

Message ID 20191021135034.18677-3-festevam@gmail.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series
  • [U-Boot,1/7] mx7ulp: Print the LDO mode status
Related show

Commit Message

Fabio Estevam Oct. 21, 2019, 1:50 p.m. UTC
The LDOVL definitions is common to all the modes, not only RUN mode,
so in order to avoid confusion, remove the _RUN notation from the PMC1
LDOVL definitions.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 arch/arm/mach-imx/mx7ulp/soc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Patch
diff mbox series

diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 751575c95e..4487fa61c0 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -18,10 +18,10 @@ 
 #define PMC1_RUN		0x8
 #define PMC1_STOP		0x10
 #define PMC1_VLPS		0x14
-#define PMC1_RUN_LDOVL_SHIFT	16
-#define PMC1_RUN_LDOVL_MASK	(0x3f << PMC1_RUN_LDOVL_SHIFT)
-#define PMC1_RUN_LDOVL_900	0x1e
-#define PMC1_RUN_LDOVL_950	0x23
+#define PMC1_LDOVL_SHIFT	16
+#define PMC1_LDOVL_MASK		(0x3f << PMC1_LDOVL_SHIFT)
+#define PMC1_LDOVL_900		0x1e
+#define PMC1_LDOVL_950		0x23
 #define PMC1_STATUS		0x20
 #define PMC1_STATUS_LDOVLF	BIT(8)
 
@@ -126,8 +126,8 @@  static void init_ldo_mode(void)
 
 	/* Set LDOVL to 0.95V in PMC1_RUN */
 	reg = readl(PMC1_BASE_ADDR + PMC1_RUN);
-	reg &= ~PMC1_RUN_LDOVL_MASK;
-	reg |= (PMC1_RUN_LDOVL_950 << PMC1_RUN_LDOVL_SHIFT);
+	reg &= ~PMC1_LDOVL_MASK;
+	reg |= (PMC1_LDOVL_950 << PMC1_LDOVL_SHIFT);
 	writel(PMC1_BASE_ADDR + PMC1_RUN, reg);
 
 	/* Wait for LDOVLF to be cleared */
@@ -137,14 +137,14 @@  static void init_ldo_mode(void)
 
 	/* Set LDOVL to 0.95V in PMC1_STOP */
 	reg = readl(PMC1_BASE_ADDR + PMC1_STOP);
-	reg &= ~PMC1_RUN_LDOVL_MASK;
-	reg |= (PMC1_RUN_LDOVL_950 << PMC1_RUN_LDOVL_SHIFT);
+	reg &= ~PMC1_LDOVL_MASK;
+	reg |= (PMC1_LDOVL_950 << PMC1_LDOVL_SHIFT);
 	writel(PMC1_BASE_ADDR + PMC1_STOP, reg);
 
 	/* Set LDOVL to 0.90V in PMC1_VLPS */
 	reg = readl(PMC1_BASE_ADDR + PMC1_VLPS);
-	reg &= ~PMC1_RUN_LDOVL_MASK;
-	reg |= (PMC1_RUN_LDOVL_900 << PMC1_RUN_LDOVL_SHIFT);
+	reg &= ~PMC1_LDOVL_MASK;
+	reg |= (PMC1_LDOVL_900 << PMC1_LDOVL_SHIFT);
 	writel(PMC1_BASE_ADDR + PMC1_VLPS, reg);
 
 	/* Set LDOEN bit */