summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-05-07 10:25:58 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-05-15 08:31:34 +0200
commited5157e8895a6bf59a8163329639e34db0702331 (patch)
treed66082c1f28541fd35b8f5e716e8a18c488792a8 /board
parentbff969eaf0f8d6743558607dfbc7a03f3a7a36d2 (diff)
downloadu-boot-imx-ed5157e8895a6bf59a8163329639e34db0702331.zip
u-boot-imx-ed5157e8895a6bf59a8163329639e34db0702331.tar.gz
u-boot-imx-ed5157e8895a6bf59a8163329639e34db0702331.tar.bz2
pmic: dialog: Avoid name conflicts
As mx53loco board has two variants: one with Dialog PMIC and another with FSL MC34708 PMIC, we need to be able to build both drivers. Change pmic_init() and PMIC_NUM_OF_REGS names to avoid build conflicts when both drivers are present. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx53loco/mx53loco.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index 0dcec9b..7ed5c4e 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -322,7 +322,7 @@ static int power_init(void)
unsigned int val, ret;
struct pmic *p;
- pmic_init();
+ pmic_dialog_init();
p = get_pmic();
/* Set VDDA to 1.25V */