diff options
author | Daniel Willerud <daniel.willerud@stericsson.com> | 2011-03-05 05:46:01 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:42:03 -0400 |
commit | cf16943947cef089c564d2be0ae9d96a285f495e (patch) | |
tree | f774d0fb4208f92c1466575fdcf778ba6a75df04 /include/linux/mfd | |
parent | 527e7e9a82ec95cdb8f694855004b3d262efd09f (diff) |
mfd: Move ab8500 gpadc header to subdir
This moves the ab8500-gpadc.h header down into the ab8500/
subdir in include/linux/mfd and fixes some whitespace in the
header in the process.
Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/ab8500/ab8500-gpadc.h (renamed from include/linux/mfd/ab8500-gpadc.h) | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/mfd/ab8500-gpadc.h b/include/linux/mfd/ab8500/ab8500-gpadc.h index 9f6cc26bc734..74b87dde9cd0 100644 --- a/include/linux/mfd/ab8500-gpadc.h +++ b/include/linux/mfd/ab8500/ab8500-gpadc.h | |||
@@ -9,19 +9,19 @@ | |||
9 | #define _AB8500_GPADC_H | 9 | #define _AB8500_GPADC_H |
10 | 10 | ||
11 | /* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */ | 11 | /* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */ |
12 | #define BAT_CTRL 0x01 | 12 | #define BAT_CTRL 0x01 |
13 | #define BTEMP_BALL 0x02 | 13 | #define BTEMP_BALL 0x02 |
14 | #define MAIN_CHARGER_V 0x03 | 14 | #define MAIN_CHARGER_V 0x03 |
15 | #define ACC_DETECT1 0x04 | 15 | #define ACC_DETECT1 0x04 |
16 | #define ACC_DETECT2 0x05 | 16 | #define ACC_DETECT2 0x05 |
17 | #define ADC_AUX1 0x06 | 17 | #define ADC_AUX1 0x06 |
18 | #define ADC_AUX2 0x07 | 18 | #define ADC_AUX2 0x07 |
19 | #define MAIN_BAT_V 0x08 | 19 | #define MAIN_BAT_V 0x08 |
20 | #define VBUS_V 0x09 | 20 | #define VBUS_V 0x09 |
21 | #define MAIN_CHARGER_C 0x0A | 21 | #define MAIN_CHARGER_C 0x0A |
22 | #define USB_CHARGER_C 0x0B | 22 | #define USB_CHARGER_C 0x0B |
23 | #define BK_BAT_V 0x0C | 23 | #define BK_BAT_V 0x0C |
24 | #define DIE_TEMP 0x0D | 24 | #define DIE_TEMP 0x0D |
25 | 25 | ||
26 | int ab8500_gpadc_convert(u8 input); | 26 | int ab8500_gpadc_convert(u8 input); |
27 | 27 | ||