Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mx7ulp: Remove the _RUN notation from the PMC1 LDOVL definitions

Browse source 
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>
This commit is contained in:
Fabio Estevam 2019-11-05 09:47:52 -03:00 • committed by Stefano Babic
parent b8cabb0e3d
commit 0619af0942
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/arm/mach-imx/mx7ulp/soc.c
View file

@ -19,10 +19,10 @@
#define PMC1_RUN 0x8 #define PMC1_RUN 0x8
#define PMC1_STOP 0x10 #define PMC1_STOP 0x10
#define PMC1_VLPS 0x14 #define PMC1_VLPS 0x14
#define PMC1_RUN_LDOVL_SHIFT 16 #define PMC1_LDOVL_SHIFT 16
#define PMC1_RUN_LDOVL_MASK (0x3f << PMC1_RUN_LDOVL_SHIFT) #define PMC1_LDOVL_MASK (0x3f << PMC1_LDOVL_SHIFT)
#define PMC1_RUN_LDOVL_900 0x1e #define PMC1_LDOVL_900 0x1e
#define PMC1_RUN_LDOVL_950 0x23 #define PMC1_LDOVL_950 0x23
#define PMC1_STATUS 0x20 #define PMC1_STATUS 0x20
#define PMC1_STATUS_LDOVLF BIT(8) #define PMC1_STATUS_LDOVLF BIT(8)
@ -127,8 +127,8 @@ static void init_ldo_mode(void)
/* Set LDOVL to 0.95V in PMC1_RUN */ /* Set LDOVL to 0.95V in PMC1_RUN */
reg = readl(PMC1_BASE_ADDR + PMC1_RUN); reg = readl(PMC1_BASE_ADDR + PMC1_RUN);
reg &= ~PMC1_RUN_LDOVL_MASK; reg &= ~PMC1_LDOVL_MASK;
reg |= (PMC1_RUN_LDOVL_950 << PMC1_RUN_LDOVL_SHIFT); reg |= (PMC1_LDOVL_950 << PMC1_LDOVL_SHIFT);
writel(PMC1_BASE_ADDR + PMC1_RUN, reg); writel(PMC1_BASE_ADDR + PMC1_RUN, reg);
/* Wait for LDOVLF to be cleared */ /* Wait for LDOVLF to be cleared */
@ -138,14 +138,14 @@ static void init_ldo_mode(void)
/* Set LDOVL to 0.95V in PMC1_STOP */ /* Set LDOVL to 0.95V in PMC1_STOP */
reg = readl(PMC1_BASE_ADDR + PMC1_STOP); reg = readl(PMC1_BASE_ADDR + PMC1_STOP);
reg &= ~PMC1_RUN_LDOVL_MASK; reg &= ~PMC1_LDOVL_MASK;
reg |= (PMC1_RUN_LDOVL_950 << PMC1_RUN_LDOVL_SHIFT); reg |= (PMC1_LDOVL_950 << PMC1_LDOVL_SHIFT);
writel(PMC1_BASE_ADDR + PMC1_STOP, reg); writel(PMC1_BASE_ADDR + PMC1_STOP, reg);
/* Set LDOVL to 0.90V in PMC1_VLPS */ /* Set LDOVL to 0.90V in PMC1_VLPS */
reg = readl(PMC1_BASE_ADDR + PMC1_VLPS); reg = readl(PMC1_BASE_ADDR + PMC1_VLPS);
reg &= ~PMC1_RUN_LDOVL_MASK; reg &= ~PMC1_LDOVL_MASK;
reg |= (PMC1_RUN_LDOVL_900 << PMC1_RUN_LDOVL_SHIFT); reg |= (PMC1_LDOVL_900 << PMC1_LDOVL_SHIFT);
writel(PMC1_BASE_ADDR + PMC1_VLPS, reg); writel(PMC1_BASE_ADDR + PMC1_VLPS, reg);
/* Set LDOEN bit */ /* Set LDOEN bit */