AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mfd: twl4030-madc: Change TWL4030_MODULE_* ids to TWL_MODULE_*

Browse Source 
To facilitate upcoming cleanup in twl stack.
No functional changes.

Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Peter Ujfalusi 2012-11-13 09:28:51 +01:00 committed by Samuel Ortiz
parent 6691ccd056
commit e45342f678
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mfd/twl4030-madc.c
View File

@ -173,7 +173,7 @@ static int twl4030battery_temperature(int raw_volt)
volt = (raw_volt * TEMP_STEP_SIZE) / TEMP_PSR_R; volt = (raw_volt * TEMP_STEP_SIZE) / TEMP_PSR_R;
/* Getting and calculating the supply current in micro ampers */ /* Getting and calculating the supply current in micro ampers */
ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val, ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, &val,
REG_BCICTL2); REG_BCICTL2);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -196,7 +196,7 @@ static int twl4030battery_current(int raw_volt)
int ret; int ret;
u8 val; u8 val;
ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val, ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, &val,
TWL4030_BCI_BCICTL1); TWL4030_BCI_BCICTL1);
if (ret) if (ret)
return ret; return ret;
@ -635,7 +635,7 @@ static int twl4030_madc_set_current_generator(struct twl4030_madc_data *madc,
int ret; int ret;
u8 regval; u8 regval;
ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE,
&regval, TWL4030_BCI_BCICTL1); &regval, TWL4030_BCI_BCICTL1);
if (ret) { if (ret) {
dev_err(madc->dev, "unable to read BCICTL1 reg 0x%X", dev_err(madc->dev, "unable to read BCICTL1 reg 0x%X",
@ -646,7 +646,7 @@ static int twl4030_madc_set_current_generator(struct twl4030_madc_data *madc,
regval |= chan ? TWL4030_BCI_ITHEN : TWL4030_BCI_TYPEN; regval |= chan ? TWL4030_BCI_ITHEN : TWL4030_BCI_TYPEN;
else else
regval &= chan ? ~TWL4030_BCI_ITHEN : ~TWL4030_BCI_TYPEN; regval &= chan ? ~TWL4030_BCI_ITHEN : ~TWL4030_BCI_TYPEN;
ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE,
regval, TWL4030_BCI_BCICTL1); regval, TWL4030_BCI_BCICTL1);
if (ret) { if (ret) {
dev_err(madc->dev, "unable to write BCICTL1 reg 0x%X\n", dev_err(madc->dev, "unable to write BCICTL1 reg 0x%X\n",
@ -668,7 +668,7 @@ static int twl4030_madc_set_power(struct twl4030_madc_data *madc, int on)
u8 regval; u8 regval;
int ret; int ret;
ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE,
&regval, TWL4030_MADC_CTRL1); &regval, TWL4030_MADC_CTRL1);
if (ret) { if (ret) {
dev_err(madc->dev, "unable to read madc ctrl1 reg 0x%X\n", dev_err(madc->dev, "unable to read madc ctrl1 reg 0x%X\n",
@ -725,7 +725,7 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto err_current_generator; goto err_current_generator;
ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE,
&regval, TWL4030_BCI_BCICTL1); &regval, TWL4030_BCI_BCICTL1);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to read reg BCI CTL1 0x%X\n", dev_err(&pdev->dev, "unable to read reg BCI CTL1 0x%X\n",
@ -733,7 +733,7 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev)
goto err_i2c; goto err_i2c;
} }
regval |= TWL4030_BCI_MESBAT; regval |= TWL4030_BCI_MESBAT;
ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE,
regval, TWL4030_BCI_BCICTL1); regval, TWL4030_BCI_BCICTL1);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to write reg BCI Ctl1 0x%X\n", dev_err(&pdev->dev, "unable to write reg BCI Ctl1 0x%X\n",