diff options
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/88pm860x.h | 3 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab5500.h (renamed from include/linux/mfd/ab5500/ab5500.h) | 0 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500-gpadc.h (renamed from include/linux/mfd/ab8500/gpadc.h) | 0 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500-gpio.h (renamed from include/linux/mfd/ab8500/gpio.h) | 0 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500-sysctrl.h (renamed from include/linux/mfd/ab8500/sysctrl.h) | 0 | ||||
-rw-r--r-- | include/linux/mfd/abx500/ab8500.h (renamed from include/linux/mfd/ab8500.h) | 0 | ||||
-rw-r--r-- | include/linux/mfd/max8925.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/max8997.h | 83 | ||||
-rw-r--r-- | include/linux/mfd/mc13xxx.h | 8 | ||||
-rw-r--r-- | include/linux/mfd/mcp.h | 7 | ||||
-rw-r--r-- | include/linux/mfd/s5m87xx/s5m-core.h | 373 | ||||
-rw-r--r-- | include/linux/mfd/s5m87xx/s5m-pmic.h | 100 | ||||
-rw-r--r-- | include/linux/mfd/s5m87xx/s5m-rtc.h | 84 | ||||
-rw-r--r-- | include/linux/mfd/stmpe.h | 16 | ||||
-rw-r--r-- | include/linux/mfd/ucb1x00.h | 5 |
15 files changed, 673 insertions, 8 deletions
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h index 63b4fb8e3b6f..92be3476c9f5 100644 --- a/include/linux/mfd/88pm860x.h +++ b/include/linux/mfd/88pm860x.h | |||
@@ -297,10 +297,11 @@ enum { | |||
297 | 297 | ||
298 | struct pm860x_chip { | 298 | struct pm860x_chip { |
299 | struct device *dev; | 299 | struct device *dev; |
300 | struct mutex io_lock; | ||
301 | struct mutex irq_lock; | 300 | struct mutex irq_lock; |
302 | struct i2c_client *client; | 301 | struct i2c_client *client; |
303 | struct i2c_client *companion; /* companion chip client */ | 302 | struct i2c_client *companion; /* companion chip client */ |
303 | struct regmap *regmap; | ||
304 | struct regmap *regmap_companion; | ||
304 | 305 | ||
305 | int buck3_double; /* DVC ramp slope double */ | 306 | int buck3_double; /* DVC ramp slope double */ |
306 | unsigned short companion_addr; | 307 | unsigned short companion_addr; |
diff --git a/include/linux/mfd/ab5500/ab5500.h b/include/linux/mfd/abx500/ab5500.h index a720051ae933..a720051ae933 100644 --- a/include/linux/mfd/ab5500/ab5500.h +++ b/include/linux/mfd/abx500/ab5500.h | |||
diff --git a/include/linux/mfd/ab8500/gpadc.h b/include/linux/mfd/abx500/ab8500-gpadc.h index 252966769d93..252966769d93 100644 --- a/include/linux/mfd/ab8500/gpadc.h +++ b/include/linux/mfd/abx500/ab8500-gpadc.h | |||
diff --git a/include/linux/mfd/ab8500/gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h index 488a8c920a29..488a8c920a29 100644 --- a/include/linux/mfd/ab8500/gpio.h +++ b/include/linux/mfd/abx500/ab8500-gpio.h | |||
diff --git a/include/linux/mfd/ab8500/sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h index 10da0291f8f8..10da0291f8f8 100644 --- a/include/linux/mfd/ab8500/sysctrl.h +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h | |||
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 838c6b487cc5..838c6b487cc5 100644 --- a/include/linux/mfd/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h index b8e6d9449086..15b2392a56fb 100644 --- a/include/linux/mfd/max8925.h +++ b/include/linux/mfd/max8925.h | |||
@@ -203,6 +203,8 @@ struct max8925_chip { | |||
203 | int irq_base; | 203 | int irq_base; |
204 | int core_irq; | 204 | int core_irq; |
205 | int tsc_irq; | 205 | int tsc_irq; |
206 | |||
207 | unsigned int wakeup_flag; | ||
206 | }; | 208 | }; |
207 | 209 | ||
208 | struct max8925_backlight_pdata { | 210 | struct max8925_backlight_pdata { |
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index 0bbd13dbe336..fff590521e50 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h | |||
@@ -77,6 +77,82 @@ struct max8997_regulator_data { | |||
77 | struct regulator_init_data *initdata; | 77 | struct regulator_init_data *initdata; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | enum max8997_muic_usb_type { | ||
81 | MAX8997_USB_HOST, | ||
82 | MAX8997_USB_DEVICE, | ||
83 | }; | ||
84 | |||
85 | enum max8997_muic_charger_type { | ||
86 | MAX8997_CHARGER_TYPE_NONE = 0, | ||
87 | MAX8997_CHARGER_TYPE_USB, | ||
88 | MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT, | ||
89 | MAX8997_CHARGER_TYPE_DEDICATED_CHG, | ||
90 | MAX8997_CHARGER_TYPE_500MA, | ||
91 | MAX8997_CHARGER_TYPE_1A, | ||
92 | MAX8997_CHARGER_TYPE_DEAD_BATTERY = 7, | ||
93 | }; | ||
94 | |||
95 | struct max8997_muic_reg_data { | ||
96 | u8 addr; | ||
97 | u8 data; | ||
98 | }; | ||
99 | |||
100 | /** | ||
101 | * struct max8997_muic_platform_data | ||
102 | * @usb_callback: callback function for USB | ||
103 | * inform callee of USB type (HOST or DEVICE) | ||
104 | * and attached state(true or false) | ||
105 | * @charger_callback: callback function for charger | ||
106 | * inform callee of charger_type | ||
107 | * and attached state(true or false) | ||
108 | * @deskdock_callback: callback function for desk dock | ||
109 | * inform callee of attached state(true or false) | ||
110 | * @cardock_callback: callback function for car dock | ||
111 | * inform callee of attached state(true or false) | ||
112 | * @mhl_callback: callback function for MHL (Mobile High-definition Link) | ||
113 | * inform callee of attached state(true or false) | ||
114 | * @uart_callback: callback function for JIG UART | ||
115 | * inform callee of attached state(true or false) | ||
116 | * @init_data: array of max8997_muic_reg_data | ||
117 | * used for initializing registers of MAX8997 MUIC device | ||
118 | * @num_init_data: array size of init_data | ||
119 | */ | ||
120 | struct max8997_muic_platform_data { | ||
121 | void (*usb_callback)(enum max8997_muic_usb_type usb_type, | ||
122 | bool attached); | ||
123 | void (*charger_callback)(bool attached, | ||
124 | enum max8997_muic_charger_type charger_type); | ||
125 | void (*deskdock_callback) (bool attached); | ||
126 | void (*cardock_callback) (bool attached); | ||
127 | void (*mhl_callback) (bool attached); | ||
128 | void (*uart_callback) (bool attached); | ||
129 | |||
130 | struct max8997_muic_reg_data *init_data; | ||
131 | int num_init_data; | ||
132 | }; | ||
133 | |||
134 | enum max8997_led_mode { | ||
135 | MAX8997_NONE, | ||
136 | MAX8997_FLASH_MODE, | ||
137 | MAX8997_MOVIE_MODE, | ||
138 | MAX8997_FLASH_PIN_CONTROL_MODE, | ||
139 | MAX8997_MOVIE_PIN_CONTROL_MODE, | ||
140 | }; | ||
141 | |||
142 | /** | ||
143 | * struct max8997_led_platform_data | ||
144 | * The number of LED devices for MAX8997 is two | ||
145 | * @mode: LED mode for each LED device | ||
146 | * @brightness: initial brightness for each LED device | ||
147 | * range: | ||
148 | * [0 - 31]: MAX8997_FLASH_MODE and MAX8997_FLASH_PIN_CONTROL_MODE | ||
149 | * [0 - 15]: MAX8997_MOVIE_MODE and MAX8997_MOVIE_PIN_CONTROL_MODE | ||
150 | */ | ||
151 | struct max8997_led_platform_data { | ||
152 | enum max8997_led_mode mode[2]; | ||
153 | u8 brightness[2]; | ||
154 | }; | ||
155 | |||
80 | struct max8997_platform_data { | 156 | struct max8997_platform_data { |
81 | /* IRQ */ | 157 | /* IRQ */ |
82 | int irq_base; | 158 | int irq_base; |
@@ -113,10 +189,13 @@ struct max8997_platform_data { | |||
113 | /* charge Full Timeout */ | 189 | /* charge Full Timeout */ |
114 | int timeout; /* 0 (no timeout), 5, 6, 7 hours */ | 190 | int timeout; /* 0 (no timeout), 5, 6, 7 hours */ |
115 | 191 | ||
116 | /* MUIC: Not implemented */ | 192 | /* ---- MUIC ---- */ |
193 | struct max8997_muic_platform_data *muic_pdata; | ||
194 | |||
117 | /* HAPTIC: Not implemented */ | 195 | /* HAPTIC: Not implemented */ |
118 | /* RTC: Not implemented */ | 196 | /* RTC: Not implemented */ |
119 | /* Flash: Not implemented */ | 197 | /* ---- LED ---- */ |
198 | struct max8997_led_platform_data *led_pdata; | ||
120 | }; | 199 | }; |
121 | 200 | ||
122 | #endif /* __LINUX_MFD_MAX8998_H */ | 201 | #endif /* __LINUX_MFD_MAX8998_H */ |
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index a98e2a316d1f..b86ee45c8b03 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h | |||
@@ -174,6 +174,9 @@ struct mc13xxx_platform_data { | |||
174 | #define MC13XXX_ADC_MODE_MULT_CHAN 3 | 174 | #define MC13XXX_ADC_MODE_MULT_CHAN 3 |
175 | 175 | ||
176 | #define MC13XXX_ADC0 43 | 176 | #define MC13XXX_ADC0 43 |
177 | #define MC13XXX_ADC0_LICELLCON (1 << 0) | ||
178 | #define MC13XXX_ADC0_CHRGICON (1 << 1) | ||
179 | #define MC13XXX_ADC0_BATICON (1 << 2) | ||
177 | #define MC13XXX_ADC0_ADREFEN (1 << 10) | 180 | #define MC13XXX_ADC0_ADREFEN (1 << 10) |
178 | #define MC13XXX_ADC0_TSMOD0 (1 << 12) | 181 | #define MC13XXX_ADC0_TSMOD0 (1 << 12) |
179 | #define MC13XXX_ADC0_TSMOD1 (1 << 13) | 182 | #define MC13XXX_ADC0_TSMOD1 (1 << 13) |
@@ -185,4 +188,9 @@ struct mc13xxx_platform_data { | |||
185 | MC13XXX_ADC0_TSMOD1 | \ | 188 | MC13XXX_ADC0_TSMOD1 | \ |
186 | MC13XXX_ADC0_TSMOD2) | 189 | MC13XXX_ADC0_TSMOD2) |
187 | 190 | ||
191 | #define MC13XXX_ADC0_CONFIG_MASK (MC13XXX_ADC0_TSMOD_MASK | \ | ||
192 | MC13XXX_ADC0_LICELLCON | \ | ||
193 | MC13XXX_ADC0_CHRGICON | \ | ||
194 | MC13XXX_ADC0_BATICON) | ||
195 | |||
188 | #endif /* ifndef __LINUX_MFD_MC13XXX_H */ | 196 | #endif /* ifndef __LINUX_MFD_MC13XXX_H */ |
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h index ee496708e38b..1515e64e3663 100644 --- a/include/linux/mfd/mcp.h +++ b/include/linux/mfd/mcp.h | |||
@@ -10,6 +10,7 @@ | |||
10 | #ifndef MCP_H | 10 | #ifndef MCP_H |
11 | #define MCP_H | 11 | #define MCP_H |
12 | 12 | ||
13 | #include <linux/mod_devicetable.h> | ||
13 | #include <mach/dma.h> | 14 | #include <mach/dma.h> |
14 | 15 | ||
15 | struct mcp_ops; | 16 | struct mcp_ops; |
@@ -26,7 +27,7 @@ struct mcp { | |||
26 | dma_device_t dma_telco_rd; | 27 | dma_device_t dma_telco_rd; |
27 | dma_device_t dma_telco_wr; | 28 | dma_device_t dma_telco_wr; |
28 | struct device attached_device; | 29 | struct device attached_device; |
29 | int gpio_base; | 30 | const char *codec; |
30 | }; | 31 | }; |
31 | 32 | ||
32 | struct mcp_ops { | 33 | struct mcp_ops { |
@@ -44,10 +45,11 @@ void mcp_reg_write(struct mcp *, unsigned int, unsigned int); | |||
44 | unsigned int mcp_reg_read(struct mcp *, unsigned int); | 45 | unsigned int mcp_reg_read(struct mcp *, unsigned int); |
45 | void mcp_enable(struct mcp *); | 46 | void mcp_enable(struct mcp *); |
46 | void mcp_disable(struct mcp *); | 47 | void mcp_disable(struct mcp *); |
48 | const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp); | ||
47 | #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) | 49 | #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) |
48 | 50 | ||
49 | struct mcp *mcp_host_alloc(struct device *, size_t); | 51 | struct mcp *mcp_host_alloc(struct device *, size_t); |
50 | int mcp_host_register(struct mcp *); | 52 | int mcp_host_register(struct mcp *, void *); |
51 | void mcp_host_unregister(struct mcp *); | 53 | void mcp_host_unregister(struct mcp *); |
52 | 54 | ||
53 | struct mcp_driver { | 55 | struct mcp_driver { |
@@ -56,6 +58,7 @@ struct mcp_driver { | |||
56 | void (*remove)(struct mcp *); | 58 | void (*remove)(struct mcp *); |
57 | int (*suspend)(struct mcp *, pm_message_t); | 59 | int (*suspend)(struct mcp *, pm_message_t); |
58 | int (*resume)(struct mcp *); | 60 | int (*resume)(struct mcp *); |
61 | const struct mcp_device_id *id_table; | ||
59 | }; | 62 | }; |
60 | 63 | ||
61 | int mcp_driver_register(struct mcp_driver *); | 64 | int mcp_driver_register(struct mcp_driver *); |
diff --git a/include/linux/mfd/s5m87xx/s5m-core.h b/include/linux/mfd/s5m87xx/s5m-core.h new file mode 100644 index 000000000000..a7480b57f92d --- /dev/null +++ b/include/linux/mfd/s5m87xx/s5m-core.h | |||
@@ -0,0 +1,373 @@ | |||
1 | /* | ||
2 | * s5m-core.h | ||
3 | * | ||
4 | * Copyright (c) 2011 Samsung Electronics Co., Ltd | ||
5 | * http://www.samsung.com | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #ifndef __LINUX_MFD_S5M_CORE_H | ||
15 | #define __LINUX_MFD_S5M_CORE_H | ||
16 | |||
17 | #define NUM_IRQ_REGS 4 | ||
18 | |||
19 | enum s5m_device_type { | ||
20 | S5M8751X, | ||
21 | S5M8763X, | ||
22 | S5M8767X, | ||
23 | }; | ||
24 | |||
25 | /* S5M8767 registers */ | ||
26 | enum s5m8767_reg { | ||
27 | S5M8767_REG_ID, | ||
28 | S5M8767_REG_INT1, | ||
29 | S5M8767_REG_INT2, | ||
30 | S5M8767_REG_INT3, | ||
31 | S5M8767_REG_INT1M, | ||
32 | S5M8767_REG_INT2M, | ||
33 | S5M8767_REG_INT3M, | ||
34 | S5M8767_REG_STATUS1, | ||
35 | S5M8767_REG_STATUS2, | ||
36 | S5M8767_REG_STATUS3, | ||
37 | S5M8767_REG_CTRL1, | ||
38 | S5M8767_REG_CTRL2, | ||
39 | S5M8767_REG_LOWBAT1, | ||
40 | S5M8767_REG_LOWBAT2, | ||
41 | S5M8767_REG_BUCHG, | ||
42 | S5M8767_REG_DVSRAMP, | ||
43 | S5M8767_REG_DVSTIMER2 = 0x10, | ||
44 | S5M8767_REG_DVSTIMER3, | ||
45 | S5M8767_REG_DVSTIMER4, | ||
46 | S5M8767_REG_LDO1, | ||
47 | S5M8767_REG_LDO2, | ||
48 | S5M8767_REG_LDO3, | ||
49 | S5M8767_REG_LDO4, | ||
50 | S5M8767_REG_LDO5, | ||
51 | S5M8767_REG_LDO6, | ||
52 | S5M8767_REG_LDO7, | ||
53 | S5M8767_REG_LDO8, | ||
54 | S5M8767_REG_LDO9, | ||
55 | S5M8767_REG_LDO10, | ||
56 | S5M8767_REG_LDO11, | ||
57 | S5M8767_REG_LDO12, | ||
58 | S5M8767_REG_LDO13, | ||
59 | S5M8767_REG_LDO14 = 0x20, | ||
60 | S5M8767_REG_LDO15, | ||
61 | S5M8767_REG_LDO16, | ||
62 | S5M8767_REG_LDO17, | ||
63 | S5M8767_REG_LDO18, | ||
64 | S5M8767_REG_LDO19, | ||
65 | S5M8767_REG_LDO20, | ||
66 | S5M8767_REG_LDO21, | ||
67 | S5M8767_REG_LDO22, | ||
68 | S5M8767_REG_LDO23, | ||
69 | S5M8767_REG_LDO24, | ||
70 | S5M8767_REG_LDO25, | ||
71 | S5M8767_REG_LDO26, | ||
72 | S5M8767_REG_LDO27, | ||
73 | S5M8767_REG_LDO28, | ||
74 | S5M8767_REG_UVLO = 0x31, | ||
75 | S5M8767_REG_BUCK1CTRL1, | ||
76 | S5M8767_REG_BUCK1CTRL2, | ||
77 | S5M8767_REG_BUCK2CTRL, | ||
78 | S5M8767_REG_BUCK2DVS1, | ||
79 | S5M8767_REG_BUCK2DVS2, | ||
80 | S5M8767_REG_BUCK2DVS3, | ||
81 | S5M8767_REG_BUCK2DVS4, | ||
82 | S5M8767_REG_BUCK2DVS5, | ||
83 | S5M8767_REG_BUCK2DVS6, | ||
84 | S5M8767_REG_BUCK2DVS7, | ||
85 | S5M8767_REG_BUCK2DVS8, | ||
86 | S5M8767_REG_BUCK3CTRL, | ||
87 | S5M8767_REG_BUCK3DVS1, | ||
88 | S5M8767_REG_BUCK3DVS2, | ||
89 | S5M8767_REG_BUCK3DVS3, | ||
90 | S5M8767_REG_BUCK3DVS4, | ||
91 | S5M8767_REG_BUCK3DVS5, | ||
92 | S5M8767_REG_BUCK3DVS6, | ||
93 | S5M8767_REG_BUCK3DVS7, | ||
94 | S5M8767_REG_BUCK3DVS8, | ||
95 | S5M8767_REG_BUCK4CTRL, | ||
96 | S5M8767_REG_BUCK4DVS1, | ||
97 | S5M8767_REG_BUCK4DVS2, | ||
98 | S5M8767_REG_BUCK4DVS3, | ||
99 | S5M8767_REG_BUCK4DVS4, | ||
100 | S5M8767_REG_BUCK4DVS5, | ||
101 | S5M8767_REG_BUCK4DVS6, | ||
102 | S5M8767_REG_BUCK4DVS7, | ||
103 | S5M8767_REG_BUCK4DVS8, | ||
104 | S5M8767_REG_BUCK5CTRL1, | ||
105 | S5M8767_REG_BUCK5CTRL2, | ||
106 | S5M8767_REG_BUCK5CTRL3, | ||
107 | S5M8767_REG_BUCK5CTRL4, | ||
108 | S5M8767_REG_BUCK5CTRL5, | ||
109 | S5M8767_REG_BUCK6CTRL1, | ||
110 | S5M8767_REG_BUCK6CTRL2, | ||
111 | S5M8767_REG_BUCK7CTRL1, | ||
112 | S5M8767_REG_BUCK7CTRL2, | ||
113 | S5M8767_REG_BUCK8CTRL1, | ||
114 | S5M8767_REG_BUCK8CTRL2, | ||
115 | S5M8767_REG_BUCK9CTRL1, | ||
116 | S5M8767_REG_BUCK9CTRL2, | ||
117 | S5M8767_REG_LDO1CTRL, | ||
118 | S5M8767_REG_LDO2_1CTRL, | ||
119 | S5M8767_REG_LDO2_2CTRL, | ||
120 | S5M8767_REG_LDO2_3CTRL, | ||
121 | S5M8767_REG_LDO2_4CTRL, | ||
122 | S5M8767_REG_LDO3CTRL, | ||
123 | S5M8767_REG_LDO4CTRL, | ||
124 | S5M8767_REG_LDO5CTRL, | ||
125 | S5M8767_REG_LDO6CTRL, | ||
126 | S5M8767_REG_LDO7CTRL, | ||
127 | S5M8767_REG_LDO8CTRL, | ||
128 | S5M8767_REG_LDO9CTRL, | ||
129 | S5M8767_REG_LDO10CTRL, | ||
130 | S5M8767_REG_LDO11CTRL, | ||
131 | S5M8767_REG_LDO12CTRL, | ||
132 | S5M8767_REG_LDO13CTRL, | ||
133 | S5M8767_REG_LDO14CTRL, | ||
134 | S5M8767_REG_LDO15CTRL, | ||
135 | S5M8767_REG_LDO16CTRL, | ||
136 | S5M8767_REG_LDO17CTRL, | ||
137 | S5M8767_REG_LDO18CTRL, | ||
138 | S5M8767_REG_LDO19CTRL, | ||
139 | S5M8767_REG_LDO20CTRL, | ||
140 | S5M8767_REG_LDO21CTRL, | ||
141 | S5M8767_REG_LDO22CTRL, | ||
142 | S5M8767_REG_LDO23CTRL, | ||
143 | S5M8767_REG_LDO24CTRL, | ||
144 | S5M8767_REG_LDO25CTRL, | ||
145 | S5M8767_REG_LDO26CTRL, | ||
146 | S5M8767_REG_LDO27CTRL, | ||
147 | S5M8767_REG_LDO28CTRL, | ||
148 | }; | ||
149 | |||
150 | /* S5M8763 registers */ | ||
151 | enum s5m8763_reg { | ||
152 | S5M8763_REG_IRQ1, | ||
153 | S5M8763_REG_IRQ2, | ||
154 | S5M8763_REG_IRQ3, | ||
155 | S5M8763_REG_IRQ4, | ||
156 | S5M8763_REG_IRQM1, | ||
157 | S5M8763_REG_IRQM2, | ||
158 | S5M8763_REG_IRQM3, | ||
159 | S5M8763_REG_IRQM4, | ||
160 | S5M8763_REG_STATUS1, | ||
161 | S5M8763_REG_STATUS2, | ||
162 | S5M8763_REG_STATUSM1, | ||
163 | S5M8763_REG_STATUSM2, | ||
164 | S5M8763_REG_CHGR1, | ||
165 | S5M8763_REG_CHGR2, | ||
166 | S5M8763_REG_LDO_ACTIVE_DISCHARGE1, | ||
167 | S5M8763_REG_LDO_ACTIVE_DISCHARGE2, | ||
168 | S5M8763_REG_BUCK_ACTIVE_DISCHARGE3, | ||
169 | S5M8763_REG_ONOFF1, | ||
170 | S5M8763_REG_ONOFF2, | ||
171 | S5M8763_REG_ONOFF3, | ||
172 | S5M8763_REG_ONOFF4, | ||
173 | S5M8763_REG_BUCK1_VOLTAGE1, | ||
174 | S5M8763_REG_BUCK1_VOLTAGE2, | ||
175 | S5M8763_REG_BUCK1_VOLTAGE3, | ||
176 | S5M8763_REG_BUCK1_VOLTAGE4, | ||
177 | S5M8763_REG_BUCK2_VOLTAGE1, | ||
178 | S5M8763_REG_BUCK2_VOLTAGE2, | ||
179 | S5M8763_REG_BUCK3, | ||
180 | S5M8763_REG_BUCK4, | ||
181 | S5M8763_REG_LDO1_LDO2, | ||
182 | S5M8763_REG_LDO3, | ||
183 | S5M8763_REG_LDO4, | ||
184 | S5M8763_REG_LDO5, | ||
185 | S5M8763_REG_LDO6, | ||
186 | S5M8763_REG_LDO7, | ||
187 | S5M8763_REG_LDO7_LDO8, | ||
188 | S5M8763_REG_LDO9_LDO10, | ||
189 | S5M8763_REG_LDO11, | ||
190 | S5M8763_REG_LDO12, | ||
191 | S5M8763_REG_LDO13, | ||
192 | S5M8763_REG_LDO14, | ||
193 | S5M8763_REG_LDO15, | ||
194 | S5M8763_REG_LDO16, | ||
195 | S5M8763_REG_BKCHR, | ||
196 | S5M8763_REG_LBCNFG1, | ||
197 | S5M8763_REG_LBCNFG2, | ||
198 | }; | ||
199 | |||
200 | enum s5m8767_irq { | ||
201 | S5M8767_IRQ_PWRR, | ||
202 | S5M8767_IRQ_PWRF, | ||
203 | S5M8767_IRQ_PWR1S, | ||
204 | S5M8767_IRQ_JIGR, | ||
205 | S5M8767_IRQ_JIGF, | ||
206 | S5M8767_IRQ_LOWBAT2, | ||
207 | S5M8767_IRQ_LOWBAT1, | ||
208 | |||
209 | S5M8767_IRQ_MRB, | ||
210 | S5M8767_IRQ_DVSOK2, | ||
211 | S5M8767_IRQ_DVSOK3, | ||
212 | S5M8767_IRQ_DVSOK4, | ||
213 | |||
214 | S5M8767_IRQ_RTC60S, | ||
215 | S5M8767_IRQ_RTCA1, | ||
216 | S5M8767_IRQ_RTCA2, | ||
217 | S5M8767_IRQ_SMPL, | ||
218 | S5M8767_IRQ_RTC1S, | ||
219 | S5M8767_IRQ_WTSR, | ||
220 | |||
221 | S5M8767_IRQ_NR, | ||
222 | }; | ||
223 | |||
224 | #define S5M8767_IRQ_PWRR_MASK (1 << 0) | ||
225 | #define S5M8767_IRQ_PWRF_MASK (1 << 1) | ||
226 | #define S5M8767_IRQ_PWR1S_MASK (1 << 3) | ||
227 | #define S5M8767_IRQ_JIGR_MASK (1 << 4) | ||
228 | #define S5M8767_IRQ_JIGF_MASK (1 << 5) | ||
229 | #define S5M8767_IRQ_LOWBAT2_MASK (1 << 6) | ||
230 | #define S5M8767_IRQ_LOWBAT1_MASK (1 << 7) | ||
231 | |||
232 | #define S5M8767_IRQ_MRB_MASK (1 << 2) | ||
233 | #define S5M8767_IRQ_DVSOK2_MASK (1 << 3) | ||
234 | #define S5M8767_IRQ_DVSOK3_MASK (1 << 4) | ||
235 | #define S5M8767_IRQ_DVSOK4_MASK (1 << 5) | ||
236 | |||
237 | #define S5M8767_IRQ_RTC60S_MASK (1 << 0) | ||
238 | #define S5M8767_IRQ_RTCA1_MASK (1 << 1) | ||
239 | #define S5M8767_IRQ_RTCA2_MASK (1 << 2) | ||
240 | #define S5M8767_IRQ_SMPL_MASK (1 << 3) | ||
241 | #define S5M8767_IRQ_RTC1S_MASK (1 << 4) | ||
242 | #define S5M8767_IRQ_WTSR_MASK (1 << 5) | ||
243 | |||
244 | enum s5m8763_irq { | ||
245 | S5M8763_IRQ_DCINF, | ||
246 | S5M8763_IRQ_DCINR, | ||
247 | S5M8763_IRQ_JIGF, | ||
248 | S5M8763_IRQ_JIGR, | ||
249 | S5M8763_IRQ_PWRONF, | ||
250 | S5M8763_IRQ_PWRONR, | ||
251 | |||
252 | S5M8763_IRQ_WTSREVNT, | ||
253 | S5M8763_IRQ_SMPLEVNT, | ||
254 | S5M8763_IRQ_ALARM1, | ||
255 | S5M8763_IRQ_ALARM0, | ||
256 | |||
257 | S5M8763_IRQ_ONKEY1S, | ||
258 | S5M8763_IRQ_TOPOFFR, | ||
259 | S5M8763_IRQ_DCINOVPR, | ||
260 | S5M8763_IRQ_CHGRSTF, | ||
261 | S5M8763_IRQ_DONER, | ||
262 | S5M8763_IRQ_CHGFAULT, | ||
263 | |||
264 | S5M8763_IRQ_LOBAT1, | ||
265 | S5M8763_IRQ_LOBAT2, | ||
266 | |||
267 | S5M8763_IRQ_NR, | ||
268 | }; | ||
269 | |||
270 | #define S5M8763_IRQ_DCINF_MASK (1 << 2) | ||
271 | #define S5M8763_IRQ_DCINR_MASK (1 << 3) | ||
272 | #define S5M8763_IRQ_JIGF_MASK (1 << 4) | ||
273 | #define S5M8763_IRQ_JIGR_MASK (1 << 5) | ||
274 | #define S5M8763_IRQ_PWRONF_MASK (1 << 6) | ||
275 | #define S5M8763_IRQ_PWRONR_MASK (1 << 7) | ||
276 | |||
277 | #define S5M8763_IRQ_WTSREVNT_MASK (1 << 0) | ||
278 | #define S5M8763_IRQ_SMPLEVNT_MASK (1 << 1) | ||
279 | #define S5M8763_IRQ_ALARM1_MASK (1 << 2) | ||
280 | #define S5M8763_IRQ_ALARM0_MASK (1 << 3) | ||
281 | |||
282 | #define S5M8763_IRQ_ONKEY1S_MASK (1 << 0) | ||
283 | #define S5M8763_IRQ_TOPOFFR_MASK (1 << 2) | ||
284 | #define S5M8763_IRQ_DCINOVPR_MASK (1 << 3) | ||
285 | #define S5M8763_IRQ_CHGRSTF_MASK (1 << 4) | ||
286 | #define S5M8763_IRQ_DONER_MASK (1 << 5) | ||
287 | #define S5M8763_IRQ_CHGFAULT_MASK (1 << 7) | ||
288 | |||
289 | #define S5M8763_IRQ_LOBAT1_MASK (1 << 0) | ||
290 | #define S5M8763_IRQ_LOBAT2_MASK (1 << 1) | ||
291 | |||
292 | #define S5M8763_ENRAMP (1 << 4) | ||
293 | |||
294 | /** | ||
295 | * struct s5m87xx_dev - s5m87xx master device for sub-drivers | ||
296 | * @dev: master device of the chip (can be used to access platform data) | ||
297 | * @i2c: i2c client private data for regulator | ||
298 | * @rtc: i2c client private data for rtc | ||
299 | * @iolock: mutex for serializing io access | ||
300 | * @irqlock: mutex for buslock | ||
301 | * @irq_base: base IRQ number for s5m87xx, required for IRQs | ||
302 | * @irq: generic IRQ number for s5m87xx | ||
303 | * @ono: power onoff IRQ number for s5m87xx | ||
304 | * @irq_masks_cur: currently active value | ||
305 | * @irq_masks_cache: cached hardware value | ||
306 | * @type: indicate which s5m87xx "variant" is used | ||
307 | */ | ||
308 | struct s5m87xx_dev { | ||
309 | struct device *dev; | ||
310 | struct regmap *regmap; | ||
311 | struct i2c_client *i2c; | ||
312 | struct i2c_client *rtc; | ||
313 | struct mutex iolock; | ||
314 | struct mutex irqlock; | ||
315 | |||
316 | int device_type; | ||
317 | int irq_base; | ||
318 | int irq; | ||
319 | int ono; | ||
320 | u8 irq_masks_cur[NUM_IRQ_REGS]; | ||
321 | u8 irq_masks_cache[NUM_IRQ_REGS]; | ||
322 | int type; | ||
323 | bool wakeup; | ||
324 | }; | ||
325 | |||
326 | int s5m_irq_init(struct s5m87xx_dev *s5m87xx); | ||
327 | void s5m_irq_exit(struct s5m87xx_dev *s5m87xx); | ||
328 | int s5m_irq_resume(struct s5m87xx_dev *s5m87xx); | ||
329 | |||
330 | extern int s5m_reg_read(struct s5m87xx_dev *s5m87xx, u8 reg, void *dest); | ||
331 | extern int s5m_bulk_read(struct s5m87xx_dev *s5m87xx, u8 reg, int count, u8 *buf); | ||
332 | extern int s5m_reg_write(struct s5m87xx_dev *s5m87xx, u8 reg, u8 value); | ||
333 | extern int s5m_bulk_write(struct s5m87xx_dev *s5m87xx, u8 reg, int count, u8 *buf); | ||
334 | extern int s5m_reg_update(struct s5m87xx_dev *s5m87xx, u8 reg, u8 val, u8 mask); | ||
335 | |||
336 | struct s5m_platform_data { | ||
337 | struct s5m_regulator_data *regulators; | ||
338 | int device_type; | ||
339 | int num_regulators; | ||
340 | |||
341 | int irq_base; | ||
342 | int (*cfg_pmic_irq)(void); | ||
343 | |||
344 | int ono; | ||
345 | bool wakeup; | ||
346 | bool buck_voltage_lock; | ||
347 | |||
348 | int buck_gpios[3]; | ||
349 | int buck2_voltage[8]; | ||
350 | bool buck2_gpiodvs; | ||
351 | int buck3_voltage[8]; | ||
352 | bool buck3_gpiodvs; | ||
353 | int buck4_voltage[8]; | ||
354 | bool buck4_gpiodvs; | ||
355 | |||
356 | int buck_set1; | ||
357 | int buck_set2; | ||
358 | int buck_set3; | ||
359 | int buck2_enable; | ||
360 | int buck3_enable; | ||
361 | int buck4_enable; | ||
362 | int buck_default_idx; | ||
363 | int buck2_default_idx; | ||
364 | int buck3_default_idx; | ||
365 | int buck4_default_idx; | ||
366 | |||
367 | int buck_ramp_delay; | ||
368 | bool buck2_ramp_enable; | ||
369 | bool buck3_ramp_enable; | ||
370 | bool buck4_ramp_enable; | ||
371 | }; | ||
372 | |||
373 | #endif /* __LINUX_MFD_S5M_CORE_H */ | ||
diff --git a/include/linux/mfd/s5m87xx/s5m-pmic.h b/include/linux/mfd/s5m87xx/s5m-pmic.h new file mode 100644 index 000000000000..a72a5d27e62e --- /dev/null +++ b/include/linux/mfd/s5m87xx/s5m-pmic.h | |||
@@ -0,0 +1,100 @@ | |||
1 | /* s5m87xx.h | ||
2 | * | ||
3 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #ifndef __LINUX_MFD_S5M_PMIC_H | ||
12 | #define __LINUX_MFD_S5M_PMIC_H | ||
13 | |||
14 | #include <linux/regulator/machine.h> | ||
15 | |||
16 | /* S5M8767 regulator ids */ | ||
17 | enum s5m8767_regulators { | ||
18 | S5M8767_LDO1, | ||
19 | S5M8767_LDO2, | ||
20 | S5M8767_LDO3, | ||
21 | S5M8767_LDO4, | ||
22 | S5M8767_LDO5, | ||
23 | S5M8767_LDO6, | ||
24 | S5M8767_LDO7, | ||
25 | S5M8767_LDO8, | ||
26 | S5M8767_LDO9, | ||
27 | S5M8767_LDO10, | ||
28 | S5M8767_LDO11, | ||
29 | S5M8767_LDO12, | ||
30 | S5M8767_LDO13, | ||
31 | S5M8767_LDO14, | ||
32 | S5M8767_LDO15, | ||
33 | S5M8767_LDO16, | ||
34 | S5M8767_LDO17, | ||
35 | S5M8767_LDO18, | ||
36 | S5M8767_LDO19, | ||
37 | S5M8767_LDO20, | ||
38 | S5M8767_LDO21, | ||
39 | S5M8767_LDO22, | ||
40 | S5M8767_LDO23, | ||
41 | S5M8767_LDO24, | ||
42 | S5M8767_LDO25, | ||
43 | S5M8767_LDO26, | ||
44 | S5M8767_LDO27, | ||
45 | S5M8767_LDO28, | ||
46 | S5M8767_BUCK1, | ||
47 | S5M8767_BUCK2, | ||
48 | S5M8767_BUCK3, | ||
49 | S5M8767_BUCK4, | ||
50 | S5M8767_BUCK5, | ||
51 | S5M8767_BUCK6, | ||
52 | S5M8767_BUCK7, | ||
53 | S5M8767_BUCK8, | ||
54 | S5M8767_BUCK9, | ||
55 | S5M8767_AP_EN32KHZ, | ||
56 | S5M8767_CP_EN32KHZ, | ||
57 | |||
58 | S5M8767_REG_MAX, | ||
59 | }; | ||
60 | |||
61 | /* S5M8763 regulator ids */ | ||
62 | enum s5m8763_regulators { | ||
63 | S5M8763_LDO1, | ||
64 | S5M8763_LDO2, | ||
65 | S5M8763_LDO3, | ||
66 | S5M8763_LDO4, | ||
67 | S5M8763_LDO5, | ||
68 | S5M8763_LDO6, | ||
69 | S5M8763_LDO7, | ||
70 | S5M8763_LDO8, | ||
71 | S5M8763_LDO9, | ||
72 | S5M8763_LDO10, | ||
73 | S5M8763_LDO11, | ||
74 | S5M8763_LDO12, | ||
75 | S5M8763_LDO13, | ||
76 | S5M8763_LDO14, | ||
77 | S5M8763_LDO15, | ||
78 | S5M8763_LDO16, | ||
79 | S5M8763_BUCK1, | ||
80 | S5M8763_BUCK2, | ||
81 | S5M8763_BUCK3, | ||
82 | S5M8763_BUCK4, | ||
83 | S5M8763_AP_EN32KHZ, | ||
84 | S5M8763_CP_EN32KHZ, | ||
85 | S5M8763_ENCHGVI, | ||
86 | S5M8763_ESAFEUSB1, | ||
87 | S5M8763_ESAFEUSB2, | ||
88 | }; | ||
89 | |||
90 | /** | ||
91 | * s5m87xx_regulator_data - regulator data | ||
92 | * @id: regulator id | ||
93 | * @initdata: regulator init data (contraints, supplies, ...) | ||
94 | */ | ||
95 | struct s5m_regulator_data { | ||
96 | int id; | ||
97 | struct regulator_init_data *initdata; | ||
98 | }; | ||
99 | |||
100 | #endif /* __LINUX_MFD_S5M_PMIC_H */ | ||
diff --git a/include/linux/mfd/s5m87xx/s5m-rtc.h b/include/linux/mfd/s5m87xx/s5m-rtc.h new file mode 100644 index 000000000000..6ce8da264cec --- /dev/null +++ b/include/linux/mfd/s5m87xx/s5m-rtc.h | |||
@@ -0,0 +1,84 @@ | |||
1 | /* | ||
2 | * s5m-rtc.h | ||
3 | * | ||
4 | * Copyright (c) 2011 Samsung Electronics Co., Ltd | ||
5 | * http://www.samsung.com | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #ifndef __LINUX_MFD_S5M_RTC_H | ||
15 | #define __LINUX_MFD_S5M_RTC_H | ||
16 | |||
17 | enum s5m87xx_rtc_reg { | ||
18 | S5M87XX_RTC_SEC, | ||
19 | S5M87XX_RTC_MIN, | ||
20 | S5M87XX_RTC_HOUR, | ||
21 | S5M87XX_RTC_WEEKDAY, | ||
22 | S5M87XX_RTC_DATE, | ||
23 | S5M87XX_RTC_MONTH, | ||
24 | S5M87XX_RTC_YEAR1, | ||
25 | S5M87XX_RTC_YEAR2, | ||
26 | S5M87XX_ALARM0_SEC, | ||
27 | S5M87XX_ALARM0_MIN, | ||
28 | S5M87XX_ALARM0_HOUR, | ||
29 | S5M87XX_ALARM0_WEEKDAY, | ||
30 | S5M87XX_ALARM0_DATE, | ||
31 | S5M87XX_ALARM0_MONTH, | ||
32 | S5M87XX_ALARM0_YEAR1, | ||
33 | S5M87XX_ALARM0_YEAR2, | ||
34 | S5M87XX_ALARM1_SEC, | ||
35 | S5M87XX_ALARM1_MIN, | ||
36 | S5M87XX_ALARM1_HOUR, | ||
37 | S5M87XX_ALARM1_WEEKDAY, | ||
38 | S5M87XX_ALARM1_DATE, | ||
39 | S5M87XX_ALARM1_MONTH, | ||
40 | S5M87XX_ALARM1_YEAR1, | ||
41 | S5M87XX_ALARM1_YEAR2, | ||
42 | S5M87XX_ALARM0_CONF, | ||
43 | S5M87XX_ALARM1_CONF, | ||
44 | S5M87XX_RTC_STATUS, | ||
45 | S5M87XX_WTSR_SMPL_CNTL, | ||
46 | S5M87XX_RTC_UDR_CON, | ||
47 | }; | ||
48 | |||
49 | #define RTC_I2C_ADDR (0x0C >> 1) | ||
50 | |||
51 | #define HOUR_12 (1 << 7) | ||
52 | #define HOUR_AMPM (1 << 6) | ||
53 | #define HOUR_PM (1 << 5) | ||
54 | #define ALARM0_STATUS (1 << 1) | ||
55 | #define ALARM1_STATUS (1 << 2) | ||
56 | #define UPDATE_AD (1 << 0) | ||
57 | |||
58 | /* RTC Control Register */ | ||
59 | #define BCD_EN_SHIFT 0 | ||
60 | #define BCD_EN_MASK (1 << BCD_EN_SHIFT) | ||
61 | #define MODEL24_SHIFT 1 | ||
62 | #define MODEL24_MASK (1 << MODEL24_SHIFT) | ||
63 | /* RTC Update Register1 */ | ||
64 | #define RTC_UDR_SHIFT 0 | ||
65 | #define RTC_UDR_MASK (1 << RTC_UDR_SHIFT) | ||
66 | /* RTC Hour register */ | ||
67 | #define HOUR_PM_SHIFT 6 | ||
68 | #define HOUR_PM_MASK (1 << HOUR_PM_SHIFT) | ||
69 | /* RTC Alarm Enable */ | ||
70 | #define ALARM_ENABLE_SHIFT 7 | ||
71 | #define ALARM_ENABLE_MASK (1 << ALARM_ENABLE_SHIFT) | ||
72 | |||
73 | enum { | ||
74 | RTC_SEC = 0, | ||
75 | RTC_MIN, | ||
76 | RTC_HOUR, | ||
77 | RTC_WEEKDAY, | ||
78 | RTC_DATE, | ||
79 | RTC_MONTH, | ||
80 | RTC_YEAR1, | ||
81 | RTC_YEAR2, | ||
82 | }; | ||
83 | |||
84 | #endif /* __LINUX_MFD_S5M_RTC_H */ | ||
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index be1af7c42e57..ca1d7a347600 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h | |||
@@ -20,6 +20,8 @@ enum stmpe_block { | |||
20 | }; | 20 | }; |
21 | 21 | ||
22 | enum stmpe_partnum { | 22 | enum stmpe_partnum { |
23 | STMPE610, | ||
24 | STMPE801, | ||
23 | STMPE811, | 25 | STMPE811, |
24 | STMPE1601, | 26 | STMPE1601, |
25 | STMPE2401, | 27 | STMPE2401, |
@@ -50,17 +52,20 @@ enum { | |||
50 | 52 | ||
51 | 53 | ||
52 | struct stmpe_variant_info; | 54 | struct stmpe_variant_info; |
55 | struct stmpe_client_info; | ||
53 | 56 | ||
54 | /** | 57 | /** |
55 | * struct stmpe - STMPE MFD structure | 58 | * struct stmpe - STMPE MFD structure |
56 | * @lock: lock protecting I/O operations | 59 | * @lock: lock protecting I/O operations |
57 | * @irq_lock: IRQ bus lock | 60 | * @irq_lock: IRQ bus lock |
58 | * @dev: device, mostly for dev_dbg() | 61 | * @dev: device, mostly for dev_dbg() |
59 | * @i2c: i2c client | 62 | * @client: client - i2c or spi |
63 | * @ci: client specific information | ||
60 | * @partnum: part number | 64 | * @partnum: part number |
61 | * @variant: the detected STMPE model number | 65 | * @variant: the detected STMPE model number |
62 | * @regs: list of addresses of registers which are at different addresses on | 66 | * @regs: list of addresses of registers which are at different addresses on |
63 | * different variants. Indexed by one of STMPE_IDX_*. | 67 | * different variants. Indexed by one of STMPE_IDX_*. |
68 | * @irq: irq number for stmpe | ||
64 | * @irq_base: starting IRQ number for internal IRQs | 69 | * @irq_base: starting IRQ number for internal IRQs |
65 | * @num_gpios: number of gpios, differs for variants | 70 | * @num_gpios: number of gpios, differs for variants |
66 | * @ier: cache of IER registers for bus_lock | 71 | * @ier: cache of IER registers for bus_lock |
@@ -71,11 +76,13 @@ struct stmpe { | |||
71 | struct mutex lock; | 76 | struct mutex lock; |
72 | struct mutex irq_lock; | 77 | struct mutex irq_lock; |
73 | struct device *dev; | 78 | struct device *dev; |
74 | struct i2c_client *i2c; | 79 | void *client; |
80 | struct stmpe_client_info *ci; | ||
75 | enum stmpe_partnum partnum; | 81 | enum stmpe_partnum partnum; |
76 | struct stmpe_variant_info *variant; | 82 | struct stmpe_variant_info *variant; |
77 | const u8 *regs; | 83 | const u8 *regs; |
78 | 84 | ||
85 | int irq; | ||
79 | int irq_base; | 86 | int irq_base; |
80 | int num_gpios; | 87 | int num_gpios; |
81 | u8 ier[2]; | 88 | u8 ier[2]; |
@@ -183,6 +190,9 @@ struct stmpe_ts_platform_data { | |||
183 | * @autosleep_timeout: inactivity timeout in milliseconds for autosleep | 190 | * @autosleep_timeout: inactivity timeout in milliseconds for autosleep |
184 | * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or | 191 | * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or |
185 | * %STMPE_NR_INTERNAL_IRQS if the GPIO driver is not used. | 192 | * %STMPE_NR_INTERNAL_IRQS if the GPIO driver is not used. |
193 | * @irq_over_gpio: true if gpio is used to get irq | ||
194 | * @irq_gpio: gpio number over which irq will be requested (significant only if | ||
195 | * irq_over_gpio is true) | ||
186 | * @gpio: GPIO-specific platform data | 196 | * @gpio: GPIO-specific platform data |
187 | * @keypad: keypad-specific platform data | 197 | * @keypad: keypad-specific platform data |
188 | * @ts: touchscreen-specific platform data | 198 | * @ts: touchscreen-specific platform data |
@@ -194,6 +204,8 @@ struct stmpe_platform_data { | |||
194 | unsigned int irq_trigger; | 204 | unsigned int irq_trigger; |
195 | bool irq_invert_polarity; | 205 | bool irq_invert_polarity; |
196 | bool autosleep; | 206 | bool autosleep; |
207 | bool irq_over_gpio; | ||
208 | int irq_gpio; | ||
197 | int autosleep_timeout; | 209 | int autosleep_timeout; |
198 | 210 | ||
199 | struct stmpe_gpio_platform_data *gpio; | 211 | struct stmpe_gpio_platform_data *gpio; |
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h index 4321f044d1e4..bc19e5fb7ea8 100644 --- a/include/linux/mfd/ucb1x00.h +++ b/include/linux/mfd/ucb1x00.h | |||
@@ -104,6 +104,9 @@ | |||
104 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) | 104 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) |
105 | #define UCB_MODE_AUD_OFF_CAN (1 << 13) | 105 | #define UCB_MODE_AUD_OFF_CAN (1 << 13) |
106 | 106 | ||
107 | struct ucb1x00_plat_data { | ||
108 | int gpio_base; | ||
109 | }; | ||
107 | 110 | ||
108 | struct ucb1x00_irq { | 111 | struct ucb1x00_irq { |
109 | void *devid; | 112 | void *devid; |
@@ -116,7 +119,7 @@ struct ucb1x00 { | |||
116 | unsigned int irq; | 119 | unsigned int irq; |
117 | struct semaphore adc_sem; | 120 | struct semaphore adc_sem; |
118 | spinlock_t io_lock; | 121 | spinlock_t io_lock; |
119 | u16 id; | 122 | const struct mcp_device_id *id; |
120 | u16 io_dir; | 123 | u16 io_dir; |
121 | u16 io_out; | 124 | u16 io_out; |
122 | u16 adc_cr; | 125 | u16 adc_cr; |