diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-05-07 10:25:58 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-05-15 08:31:34 +0200 |
| commit | ed5157e8895a6bf59a8163329639e34db0702331 (patch) | |
| tree | d66082c1f28541fd35b8f5e716e8a18c488792a8 /drivers | |
| parent | bff969eaf0f8d6743558607dfbc7a03f3a7a36d2 (diff) | |
| download | talos-obmc-uboot-ed5157e8895a6bf59a8163329639e34db0702331.tar.gz talos-obmc-uboot-ed5157e8895a6bf59a8163329639e34db0702331.zip | |
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 'drivers')
| -rw-r--r-- | drivers/misc/pmic_dialog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/pmic_dialog.c b/drivers/misc/pmic_dialog.c index 724207349c..e97af1d1d0 100644 --- a/drivers/misc/pmic_dialog.c +++ b/drivers/misc/pmic_dialog.c @@ -20,13 +20,13 @@ #include <pmic.h> #include <dialog_pmic.h> -int pmic_init(void) +int pmic_dialog_init(void) { struct pmic *p = get_pmic(); static const char name[] = "DIALOG_PMIC"; p->name = name; - p->number_of_regs = PMIC_NUM_OF_REGS; + p->number_of_regs = DIALOG_NUM_OF_REGS; p->interface = PMIC_I2C; p->hw.i2c.addr = CONFIG_SYS_DIALOG_PMIC_I2C_ADDR; |
