From: Fabio Estevam Date: Wed, 20 Nov 2013 22:26:06 +0000 (-0200) Subject: power: power_fsl: Pass p->bus in the same way for SPI and I2C cases X-Git-Tag: v2014.01-rc3~9^2~47^2~34 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=839f4d4e87f40e68de5d57ccff502fe97513d1fa;p=karo-tx-uboot.git power: power_fsl: Pass p->bus in the same way for SPI and I2C cases There is no need to pass p->bus differently when the PMIC is connected via SPI or via I2C. Handle the both cases in the same way. Signed-off-by: Fabio Estevam --- diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index ed778f333e..ac0b541d79 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