aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/mc13xxx-core.c12
-rw-r--r--include/linux/mfd/mc13783.h112
2 files changed, 0 insertions, 124 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 5ee5e64d586b..5f782adffc1d 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -30,16 +30,6 @@ struct mc13xxx {
30 int adcflags; 30 int adcflags;
31}; 31};
32 32
33struct mc13783 {
34 struct mc13xxx mc13xxx;
35};
36
37struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783)
38{
39 return &mc13783->mc13xxx;
40}
41EXPORT_SYMBOL(mc13783_to_mc13xxx);
42
43#define MC13XXX_IRQSTAT0 0 33#define MC13XXX_IRQSTAT0 0
44#define MC13XXX_IRQSTAT0_ADCDONEI (1 << 0) 34#define MC13XXX_IRQSTAT0_ADCDONEI (1 << 0)
45#define MC13XXX_IRQSTAT0_ADCBISDONEI (1 << 1) 35#define MC13XXX_IRQSTAT0_ADCBISDONEI (1 << 1)
@@ -558,8 +548,6 @@ static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
558 return mc13xxx_chipname[devid->driver_data]; 548 return mc13xxx_chipname[devid->driver_data];
559} 549}
560 550
561#include <linux/mfd/mc13783.h>
562
563int mc13xxx_get_flags(struct mc13xxx *mc13xxx) 551int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
564{ 552{
565 struct mc13xxx_platform_data *pdata = 553 struct mc13xxx_platform_data *pdata =
diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h
index e7a3c0169f63..a8eeda773a7b 100644
--- a/include/linux/mfd/mc13783.h
+++ b/include/linux/mfd/mc13783.h
@@ -12,118 +12,6 @@
12 12
13#include <linux/mfd/mc13xxx.h> 13#include <linux/mfd/mc13xxx.h>
14 14
15struct mc13783;
16
17struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783);
18
19static inline void mc13783_lock(struct mc13783 *mc13783)
20{
21 mc13xxx_lock(mc13783_to_mc13xxx(mc13783));
22}
23
24static inline void mc13783_unlock(struct mc13783 *mc13783)
25{
26 mc13xxx_unlock(mc13783_to_mc13xxx(mc13783));
27}
28
29static inline int mc13783_reg_read(struct mc13783 *mc13783,
30 unsigned int offset, u32 *val)
31{
32 return mc13xxx_reg_read(mc13783_to_mc13xxx(mc13783), offset, val);
33}
34
35static inline int mc13783_reg_write(struct mc13783 *mc13783,
36 unsigned int offset, u32 val)
37{
38 return mc13xxx_reg_write(mc13783_to_mc13xxx(mc13783), offset, val);
39}
40
41static inline int mc13783_reg_rmw(struct mc13783 *mc13783,
42 unsigned int offset, u32 mask, u32 val)
43{
44 return mc13xxx_reg_rmw(mc13783_to_mc13xxx(mc13783), offset, mask, val);
45}
46
47static inline int mc13783_get_flags(struct mc13783 *mc13783)
48{
49 return mc13xxx_get_flags(mc13783_to_mc13xxx(mc13783));
50}
51
52static inline int mc13783_irq_request(struct mc13783 *mc13783, int irq,
53 irq_handler_t handler, const char *name, void *dev)
54{
55 return mc13xxx_irq_request(mc13783_to_mc13xxx(mc13783), irq,
56 handler, name, dev);
57}
58
59static inline int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq,
60 irq_handler_t handler, const char *name, void *dev)
61{
62 return mc13xxx_irq_request_nounmask(mc13783_to_mc13xxx(mc13783), irq,
63 handler, name, dev);
64}
65
66static inline int mc13783_irq_free(struct mc13783 *mc13783, int irq, void *dev)
67{
68 return mc13xxx_irq_free(mc13783_to_mc13xxx(mc13783), irq, dev);
69}
70
71static inline int mc13783_irq_mask(struct mc13783 *mc13783, int irq)
72{
73 return mc13xxx_irq_mask(mc13783_to_mc13xxx(mc13783), irq);
74}
75
76static inline int mc13783_irq_unmask(struct mc13783 *mc13783, int irq)
77{
78 return mc13xxx_irq_unmask(mc13783_to_mc13xxx(mc13783), irq);
79}
80static inline int mc13783_irq_status(struct mc13783 *mc13783, int irq,
81 int *enabled, int *pending)
82{
83 return mc13xxx_irq_status(mc13783_to_mc13xxx(mc13783),
84 irq, enabled, pending);
85}
86
87static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq)
88{
89 return mc13xxx_irq_ack(mc13783_to_mc13xxx(mc13783), irq);
90}
91
92#define MC13783_ADC0 MC13XXX_ADC0
93#define MC13783_ADC0_ADREFEN MC13XXX_ADC0_ADREFEN
94#define MC13783_ADC0_TSMOD0 MC13XXX_ADC0_TSMOD0
95#define MC13783_ADC0_TSMOD1 MC13XXX_ADC0_TSMOD1
96#define MC13783_ADC0_TSMOD2 MC13XXX_ADC0_TSMOD2
97#define MC13783_ADC0_ADINC1 MC13XXX_ADC0_ADINC1
98#define MC13783_ADC0_ADINC2 MC13XXX_ADC0_ADINC2
99
100#define MC13783_ADC0_TSMOD_MASK MC13XXX_ADC0_TSMOD_MASK
101
102#define mc13783_regulator_init_data mc13xxx_regulator_init_data
103#define mc13783_regulator_platform_data mc13xxx_regulator_platform_data
104#define mc13783_led_platform_data mc13xxx_led_platform_data
105#define mc13783_leds_platform_data mc13xxx_leds_platform_data
106
107#define mc13783_platform_data mc13xxx_platform_data
108#define MC13783_USE_TOUCHSCREEN MC13XXX_USE_TOUCHSCREEN
109#define MC13783_USE_CODEC MC13XXX_USE_CODEC
110#define MC13783_USE_ADC MC13XXX_USE_ADC
111#define MC13783_USE_RTC MC13XXX_USE_RTC
112#define MC13783_USE_REGULATOR MC13XXX_USE_REGULATOR
113#define MC13783_USE_LED MC13XXX_USE_LED
114
115#define MC13783_ADC_MODE_TS MC13XXX_ADC_MODE_TS
116#define MC13783_ADC_MODE_SINGLE_CHAN MC13XXX_ADC_MODE_SINGLE_CHAN
117#define MC13783_ADC_MODE_MULT_CHAN MC13XXX_ADC_MODE_MULT_CHAN
118
119static inline int mc13783_adc_do_conversion(struct mc13783 *mc13783,
120 unsigned int mode, unsigned int channel, unsigned int *sample)
121{
122 return mc13xxx_adc_do_conversion(mc13783_to_mc13xxx(mc13783), mode,
123 channel, sample);
124}
125
126
127#define MC13783_REG_SW1A 0 15#define MC13783_REG_SW1A 0
128#define MC13783_REG_SW1B 1 16#define MC13783_REG_SW1B 1
129#define MC13783_REG_SW2A 2 17#define MC13783_REG_SW2A 2