lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Move ab8500 gpadc header to subdir

Browse Source 
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>
This commit is contained in:
Daniel Willerud
2011-03-05 11:46:01 +01:00
committed by Samuel Ortiz
parent 527e7e9a82
commit cf16943947
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/ab8500-gpadc.c
View File

@@ -17,7 +17,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mfd/ab8500.h> #include <linux/mfd/ab8500.h>
#include <linux/mfd/abx500.h> #include <linux/mfd/abx500.h>
#include <linux/mfd/ab8500-gpadc.h> #include <linux/mfd/ab8500/ab8500-gpadc.h>
/* /*
* GPADC register offsets * GPADC register offsets

22
include/linux/mfd/ab8500-gpadc.h → include/linux/mfd/ab8500/ab8500-gpadc.h
View File

@@ -9,19 +9,19 @@
#define _AB8500_GPADC_H #define _AB8500_GPADC_H
/* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */ /* GPADC source: From datasheet(ADCSwSel[4:0] in GPADCCtrl2) */
#define BAT_CTRL 0x01 #define BAT_CTRL 0x01
#define BTEMP_BALL 0x02 #define BTEMP_BALL 0x02
#define MAIN_CHARGER_V 0x03 #define MAIN_CHARGER_V 0x03
#define ACC_DETECT1 0x04 #define ACC_DETECT1 0x04
#define ACC_DETECT2 0x05 #define ACC_DETECT2 0x05
#define ADC_AUX1 0x06 #define ADC_AUX1 0x06
#define ADC_AUX2 0x07 #define ADC_AUX2 0x07
#define MAIN_BAT_V 0x08 #define MAIN_BAT_V 0x08
#define VBUS_V 0x09 #define VBUS_V 0x09
#define MAIN_CHARGER_C 0x0A #define MAIN_CHARGER_C 0x0A
#define USB_CHARGER_C 0x0B #define USB_CHARGER_C 0x0B
#define BK_BAT_V 0x0C #define BK_BAT_V 0x0C
#define DIE_TEMP 0x0D #define DIE_TEMP 0x0D
int ab8500_gpadc_convert(u8 input); int ab8500_gpadc_convert(u8 input);