summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-06 08:49:58 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-06 08:49:58 +0100
commita891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch)
tree9a5d44eb1fcca45dfd30557318f786b66392a8f3 /drivers/power
parent2931fa4db349c97f882ffda42e901208654b5ca9 (diff)
parent4611d5bab26f93471b84f6f33967cef69b3f723a (diff)
downloadu-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip
u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz
u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_fsl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index ed778f3..ac0b541 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -36,10 +36,10 @@ int pmic_init(unsigned char bus)
p->name = name;
p->number_of_regs = PMIC_NUM_OF_REGS;
+ p->bus = bus;
#if defined(CONFIG_POWER_SPI)
p->interface = PMIC_SPI;
- p->bus = CONFIG_FSL_PMIC_BUS;
p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
@@ -50,7 +50,6 @@ int pmic_init(unsigned char bus)
p->interface = PMIC_I2C;
p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
- p->bus = bus;
#else
#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
#endif