aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
-rw-r--r--include/linux/mfd/ab8500/ab8500-gpadc.h (renamed from include/linux/mfd/ab8500-gpadc.h)22
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 19339bc439ca..f60f71f4b473 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -17,7 +17,7 @@
17#include <linux/slab.h> 17#include <linux/slab.h>
18#include <linux/mfd/ab8500.h> 18#include <linux/mfd/ab8500.h>
19#include <linux/mfd/abx500.h> 19#include <linux/mfd/abx500.h>
20#include <linux/mfd/ab8500-gpadc.h> 20#include <linux/mfd/ab8500/ab8500-gpadc.h>
21 21
22/* 22/*
23 * GPADC register offsets 23 * GPADC register offsets
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
26int ab8500_gpadc_convert(u8 input); 26int ab8500_gpadc_convert(u8 input);
27 27