diff options
| author | Marek Belisko <marek.belisko@open-nandra.com> | 2013-08-22 00:45:10 +0200 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-08-27 18:26:44 -0700 |
| commit | 8e2747f031bd322d0fc25e0338ef50d4c18843d4 (patch) | |
| tree | d31b4af7637f4af5ba2776f9a386a4cceb382b3a /drivers/power/rx51_battery.c | |
| parent | d7bf353fd0aa3e12060ce64c8a7b4aaf4336145c (diff) | |
| download | linux-stable-8e2747f031bd322d0fc25e0338ef50d4c18843d4.tar.gz linux-stable-8e2747f031bd322d0fc25e0338ef50d4c18843d4.tar.bz2 linux-stable-8e2747f031bd322d0fc25e0338ef50d4c18843d4.zip | |
rx51_battery: Replace hardcoded channels values.
In twl4030_madc header exist defines for fixed channels + add rx51
specific channels and replace all hardcoded channels values.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power/rx51_battery.c')
| -rw-r--r-- | drivers/power/rx51_battery.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c index 8a6288d87056..03f57615be56 100644 --- a/drivers/power/rx51_battery.c +++ b/drivers/power/rx51_battery.c @@ -25,6 +25,10 @@ #include <linux/slab.h> #include <linux/i2c/twl4030-madc.h> +/* RX51 specific channels */ +#define TWL4030_MADC_BTEMP_RX51 TWL4030_MADC_ADCIN0 +#define TWL4030_MADC_BCI_RX51 TWL4030_MADC_ADCIN4 + struct rx51_device_info { struct device *dev; struct power_supply bat; @@ -37,7 +41,7 @@ static int rx51_battery_read_adc(int channel) { struct twl4030_madc_request req; - req.channels = 1 << channel; + req.channels = channel; req.do_avg = 1; req.method = TWL4030_MADC_SW1; req.func_cb = NULL; @@ -56,7 +60,7 @@ static int rx51_battery_read_adc(int channel) */ static int rx51_battery_read_voltage(struct rx51_device_info *di) { - int voltage = rx51_battery_read_adc(12); + int voltage = rx51_battery_read_adc(TWL4030_MADC_VBAT); if (voltage < 0) return voltage; @@ -108,7 +112,7 @@ static int rx51_battery_read_temperature(struct rx51_device_info *di) { int min = 0; int max = ARRAY_SIZE(rx51_temp_table2) - 1; - int raw = rx51_battery_read_adc(0); + int raw = rx51_battery_read_adc(TWL4030_MADC_BTEMP_RX51); /* Zero and negative values are undefined */ if (raw <= 0) @@ -142,7 +146,7 @@ static int rx51_battery_read_temperature(struct rx51_device_info *di) */ static int rx51_battery_read_capacity(struct rx51_device_info *di) { - int capacity = rx51_battery_read_adc(4); + int capacity = rx51_battery_read_adc(TWL4030_MADC_BCI_RX51); if (capacity < 0) return capacity; |