diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-11-13 03:28:51 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-21 10:08:04 -0500 |
commit | e45342f678d0f08d284358504f995f495fc6f4f1 (patch) | |
tree | de4aea9177fe04ed2848127cbfe9796c25851ff6 /drivers/mfd | |
parent | 6691ccd0565954f2275fb10cb5e4f0cef4a9ff64 (diff) |
mfd: twl4030-madc: Change TWL4030_MODULE_* ids to TWL_MODULE_*
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl4030-madc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c index 456ecb5ac4fe..2baabaa14244 100644 --- a/drivers/mfd/twl4030-madc.c +++ b/drivers/mfd/twl4030-madc.c | |||
@@ -173,7 +173,7 @@ static int twl4030battery_temperature(int raw_volt) | |||
173 | 173 | ||
174 | volt = (raw_volt * TEMP_STEP_SIZE) / TEMP_PSR_R; | 174 | volt = (raw_volt * TEMP_STEP_SIZE) / TEMP_PSR_R; |
175 | /* Getting and calculating the supply current in micro ampers */ | 175 | /* Getting and calculating the supply current in micro ampers */ |
176 | ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val, | 176 | ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, &val, |
177 | REG_BCICTL2); | 177 | REG_BCICTL2); |
178 | if (ret < 0) | 178 | if (ret < 0) |
179 | return ret; | 179 | return ret; |
@@ -196,7 +196,7 @@ static int twl4030battery_current(int raw_volt) | |||
196 | int ret; | 196 | int ret; |
197 | u8 val; | 197 | u8 val; |
198 | 198 | ||
199 | ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, &val, | 199 | ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, &val, |
200 | TWL4030_BCI_BCICTL1); | 200 | TWL4030_BCI_BCICTL1); |
201 | if (ret) | 201 | if (ret) |
202 | return ret; | 202 | return ret; |
@@ -635,7 +635,7 @@ static int twl4030_madc_set_current_generator(struct twl4030_madc_data *madc, | |||
635 | int ret; | 635 | int ret; |
636 | u8 regval; | 636 | u8 regval; |
637 | 637 | ||
638 | ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, | 638 | ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, |
639 | ®val, TWL4030_BCI_BCICTL1); | 639 | ®val, TWL4030_BCI_BCICTL1); |
640 | if (ret) { | 640 | if (ret) { |
641 | dev_err(madc->dev, "unable to read BCICTL1 reg 0x%X", | 641 | 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, | |||
646 | regval |= chan ? TWL4030_BCI_ITHEN : TWL4030_BCI_TYPEN; | 646 | regval |= chan ? TWL4030_BCI_ITHEN : TWL4030_BCI_TYPEN; |
647 | else | 647 | else |
648 | regval &= chan ? ~TWL4030_BCI_ITHEN : ~TWL4030_BCI_TYPEN; | 648 | regval &= chan ? ~TWL4030_BCI_ITHEN : ~TWL4030_BCI_TYPEN; |
649 | ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, | 649 | ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, |
650 | regval, TWL4030_BCI_BCICTL1); | 650 | regval, TWL4030_BCI_BCICTL1); |
651 | if (ret) { | 651 | if (ret) { |
652 | dev_err(madc->dev, "unable to write BCICTL1 reg 0x%X\n", | 652 | 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) | |||
668 | u8 regval; | 668 | u8 regval; |
669 | int ret; | 669 | int ret; |
670 | 670 | ||
671 | ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, | 671 | ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, |
672 | ®val, TWL4030_MADC_CTRL1); | 672 | ®val, TWL4030_MADC_CTRL1); |
673 | if (ret) { | 673 | if (ret) { |
674 | dev_err(madc->dev, "unable to read madc ctrl1 reg 0x%X\n", | 674 | 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) | |||
725 | if (ret < 0) | 725 | if (ret < 0) |
726 | goto err_current_generator; | 726 | goto err_current_generator; |
727 | 727 | ||
728 | ret = twl_i2c_read_u8(TWL4030_MODULE_MAIN_CHARGE, | 728 | ret = twl_i2c_read_u8(TWL_MODULE_MAIN_CHARGE, |
729 | ®val, TWL4030_BCI_BCICTL1); | 729 | ®val, TWL4030_BCI_BCICTL1); |
730 | if (ret) { | 730 | if (ret) { |
731 | dev_err(&pdev->dev, "unable to read reg BCI CTL1 0x%X\n", | 731 | 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) | |||
733 | goto err_i2c; | 733 | goto err_i2c; |
734 | } | 734 | } |
735 | regval |= TWL4030_BCI_MESBAT; | 735 | regval |= TWL4030_BCI_MESBAT; |
736 | ret = twl_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, | 736 | ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, |
737 | regval, TWL4030_BCI_BCICTL1); | 737 | regval, TWL4030_BCI_BCICTL1); |
738 | if (ret) { | 738 | if (ret) { |
739 | dev_err(&pdev->dev, "unable to write reg BCI Ctl1 0x%X\n", | 739 | dev_err(&pdev->dev, "unable to write reg BCI Ctl1 0x%X\n", |