sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Fabio Estevam 2012-05-07 10:25:58 +00:00 committed by Albert ARIBAUD
parent bff969eaf0
commit ed5157e889
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/freescale/mx53loco/mx53loco.c
View File

@ -322,7 +322,7 @@ static int power_init(void)
unsigned int val, ret; unsigned int val, ret;
struct pmic *p; struct pmic *p;
pmic_init(); pmic_dialog_init();
p = get_pmic(); p = get_pmic();
/* Set VDDA to 1.25V */ /* Set VDDA to 1.25V */

4
drivers/misc/pmic_dialog.c
View File

@ -20,13 +20,13 @@
#include <pmic.h> #include <pmic.h>
#include <dialog_pmic.h> #include <dialog_pmic.h>
int pmic_init(void) int pmic_dialog_init(void)
{ {
struct pmic *p = get_pmic(); struct pmic *p = get_pmic();
static const char name[] = "DIALOG_PMIC"; static const char name[] = "DIALOG_PMIC";
p->name = name; p->name = name;
p->number_of_regs = PMIC_NUM_OF_REGS; p->number_of_regs = DIALOG_NUM_OF_REGS;
p->interface = PMIC_I2C; p->interface = PMIC_I2C;
p->hw.i2c.addr = CONFIG_SYS_DIALOG_PMIC_I2C_ADDR; p->hw.i2c.addr = CONFIG_SYS_DIALOG_PMIC_I2C_ADDR;

2
include/dialog_pmic.h
View File

@ -164,7 +164,7 @@ enum {
DA9053_GPID7_REG, DA9053_GPID7_REG,
DA9053_GPID8_REG, DA9053_GPID8_REG,
DA9053_GPID9_REG, DA9053_GPID9_REG,
PMIC_NUM_OF_REGS, DIALOG_NUM_OF_REGS,
}; };
#define DA_BUCKCORE_VBCORE_1_250V 0x1E #define DA_BUCKCORE_VBCORE_1_250V 0x1E

1
include/pmic.h
View File

@ -55,6 +55,7 @@ struct pmic {
}; };
int pmic_init(void); int pmic_init(void);
int pmic_dialog_init(void);
int check_reg(u32 reg); int check_reg(u32 reg);
struct pmic *get_pmic(void); struct pmic *get_pmic(void);
int pmic_probe(struct pmic *p); int pmic_probe(struct pmic *p);