aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-04 20:43:30 -0400
committerTony Lindgren <tony@atomide.com>2012-09-12 21:06:30 -0400
commita940d9a1cb2ea0833421fd57e47f8ce2a6d9953b (patch)
tree3d63abb69913246bb8805a1b8b313668e648e943 /arch
parent714df7b8abafa8de4830412cc88fd9415d9bb86a (diff)
ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
We can't use hardcoded interrupts for SPARSE_IRQ, and can replace the hardcoded gpio_base with twl_gpiochip.base after it's been allocated. Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c3
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c3
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c1
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c3
-rw-r--r--arch/arm/mach-omap2/board-devkit8000.c3
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c3
-rw-r--r--arch/arm/mach-omap2/board-ldp.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3logic.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3stalker.c3
-rw-r--r--arch/arm/mach-omap2/board-omap3touchbook.c3
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c1
-rw-r--r--arch/arm/mach-omap2/board-overo.c3
-rw-r--r--arch/arm/mach-omap2/board-rm680.c3
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c3
-rw-r--r--arch/arm/mach-omap2/board-zoom-peripherals.c3
18 files changed, 0 insertions, 50 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 36eee4b512f6..cacc49889129 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -211,9 +211,6 @@ static struct regulator_init_data sdp2430_vmmc1 = {
211}; 211};
212 212
213static struct twl4030_gpio_platform_data sdp2430_gpio_data = { 213static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
214 .gpio_base = OMAP_MAX_GPIO_LINES,
215 .irq_base = TWL4030_GPIO_IRQ_BASE,
216 .irq_end = TWL4030_GPIO_IRQ_END,
217}; 214};
218 215
219static struct twl4030_platform_data sdp2430_twldata = { 216static struct twl4030_platform_data sdp2430_twldata = {
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 0f78cdbec5c1..c843d01aedda 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -229,9 +229,6 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
229} 229}
230 230
231static struct twl4030_gpio_platform_data sdp3430_gpio_data = { 231static struct twl4030_gpio_platform_data sdp3430_gpio_data = {
232 .gpio_base = OMAP_MAX_GPIO_LINES,
233 .irq_base = TWL4030_GPIO_IRQ_BASE,
234 .irq_end = TWL4030_GPIO_IRQ_END,
235 .pulldowns = BIT(2) | BIT(6) | BIT(8) | BIT(13) 232 .pulldowns = BIT(2) | BIT(6) | BIT(8) | BIT(13)
236 | BIT(16) | BIT(17), 233 | BIT(16) | BIT(17),
237 .setup = sdp3430_twl_gpio_setup, 234 .setup = sdp3430_twl_gpio_setup,
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 04e857419bb6..ee8260481273 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -543,7 +543,6 @@ static struct twl6040_platform_data twl6040_data = {
543 .codec = &twl6040_codec, 543 .codec = &twl6040_codec,
544 .vibra = &twl6040_vibra, 544 .vibra = &twl6040_vibra,
545 .audpwron_gpio = 127, 545 .audpwron_gpio = 127,
546 .irq_base = TWL6040_CODEC_IRQ_BASE,
547}; 546};
548 547
549static struct twl4030_platform_data sdp4430_twldata = { 548static struct twl4030_platform_data sdp4430_twldata = {
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index d94a640fe41c..ea3410953d2c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -469,9 +469,6 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
469} 469}
470 470
471static struct twl4030_gpio_platform_data cm_t35_gpio_data = { 471static struct twl4030_gpio_platform_data cm_t35_gpio_data = {
472 .gpio_base = OMAP_MAX_GPIO_LINES,
473 .irq_base = TWL4030_GPIO_IRQ_BASE,
474 .irq_end = TWL4030_GPIO_IRQ_END,
475 .setup = cm_t35_twl_gpio_setup, 472 .setup = cm_t35_twl_gpio_setup,
476}; 473};
477 474
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 870a2a55a032..9032807702b5 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -235,9 +235,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
235} 235}
236 236
237static struct twl4030_gpio_platform_data devkit8000_gpio_data = { 237static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
238 .gpio_base = OMAP_MAX_GPIO_LINES,
239 .irq_base = TWL4030_GPIO_IRQ_BASE,
240 .irq_end = TWL4030_GPIO_IRQ_END,
241 .use_leds = true, 238 .use_leds = true,
242 .pulldowns = BIT(1) | BIT(2) | BIT(6) | BIT(8) | BIT(13) 239 .pulldowns = BIT(1) | BIT(2) | BIT(6) | BIT(8) | BIT(13)
243 | BIT(15) | BIT(16) | BIT(17), 240 | BIT(15) | BIT(16) | BIT(17),
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 01103b38f77f..577554933862 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -424,9 +424,6 @@ static int igep_twl_gpio_setup(struct device *dev,
424}; 424};
425 425
426static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = { 426static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
427 .gpio_base = OMAP_MAX_GPIO_LINES,
428 .irq_base = TWL4030_GPIO_IRQ_BASE,
429 .irq_end = TWL4030_GPIO_IRQ_END,
430 .use_leds = true, 427 .use_leds = true,
431 .setup = igep_twl_gpio_setup, 428 .setup = igep_twl_gpio_setup,
432}; 429};
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index c37c2a17c410..bea2e3a4c00f 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -274,9 +274,6 @@ static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
274} 274}
275 275
276static struct twl4030_gpio_platform_data ldp_gpio_data = { 276static struct twl4030_gpio_platform_data ldp_gpio_data = {
277 .gpio_base = OMAP_MAX_GPIO_LINES,
278 .irq_base = TWL4030_GPIO_IRQ_BASE,
279 .irq_end = TWL4030_GPIO_IRQ_END,
280 .setup = ldp_twl_gpio_setup, 277 .setup = ldp_twl_gpio_setup,
281}; 278};
282 279
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 293e3b26c471..9d9b2abaf7d9 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -296,9 +296,6 @@ static int beagle_twl_gpio_setup(struct device *dev,
296} 296}
297 297
298static struct twl4030_gpio_platform_data beagle_gpio_data = { 298static struct twl4030_gpio_platform_data beagle_gpio_data = {
299 .gpio_base = OMAP_MAX_GPIO_LINES,
300 .irq_base = TWL4030_GPIO_IRQ_BASE,
301 .irq_end = TWL4030_GPIO_IRQ_END,
302 .use_leds = true, 299 .use_leds = true,
303 .pullups = BIT(1), 300 .pullups = BIT(1),
304 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) 301 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 851aec6ecb8a..493bd96746b9 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -388,9 +388,6 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
388} 388}
389 389
390static struct twl4030_gpio_platform_data omap3evm_gpio_data = { 390static struct twl4030_gpio_platform_data omap3evm_gpio_data = {
391 .gpio_base = OMAP_MAX_GPIO_LINES,
392 .irq_base = TWL4030_GPIO_IRQ_BASE,
393 .irq_end = TWL4030_GPIO_IRQ_END,
394 .use_leds = true, 391 .use_leds = true,
395 .setup = omap3evm_twl_gpio_setup, 392 .setup = omap3evm_twl_gpio_setup,
396}; 393};
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index a63a49d51fc8..8fe7f0cd9b0f 100644
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -77,9 +77,6 @@ static struct regulator_init_data omap3logic_vmmc1 = {
77}; 77};
78 78
79static struct twl4030_gpio_platform_data omap3logic_gpio_data = { 79static struct twl4030_gpio_platform_data omap3logic_gpio_data = {
80 .gpio_base = OMAP_MAX_GPIO_LINES,
81 .irq_base = TWL4030_GPIO_IRQ_BASE,
82 .irq_end = TWL4030_GPIO_IRQ_END,
83 .use_leds = true, 80 .use_leds = true,
84 .pullups = BIT(1), 81 .pullups = BIT(1),
85 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) 82 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8)
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 633c445c7cc4..38521d43b6dd 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -320,9 +320,6 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
320} 320}
321 321
322static struct twl4030_gpio_platform_data omap3pandora_gpio_data = { 322static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
323 .gpio_base = OMAP_MAX_GPIO_LINES,
324 .irq_base = TWL4030_GPIO_IRQ_BASE,
325 .irq_end = TWL4030_GPIO_IRQ_END,
326 .setup = omap3pandora_twl_gpio_setup, 323 .setup = omap3pandora_twl_gpio_setup,
327}; 324};
328 325
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index 421fb8e76f27..87aa5b1d4c88 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -278,9 +278,6 @@ omap3stalker_twl_gpio_setup(struct device *dev,
278} 278}
279 279
280static struct twl4030_gpio_platform_data omap3stalker_gpio_data = { 280static struct twl4030_gpio_platform_data omap3stalker_gpio_data = {
281 .gpio_base = OMAP_MAX_GPIO_LINES,
282 .irq_base = TWL4030_GPIO_IRQ_BASE,
283 .irq_end = TWL4030_GPIO_IRQ_END,
284 .use_leds = true, 281 .use_leds = true,
285 .setup = omap3stalker_twl_gpio_setup, 282 .setup = omap3stalker_twl_gpio_setup,
286}; 283};
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index d3556c938900..88dc913b6325 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -138,9 +138,6 @@ static int touchbook_twl_gpio_setup(struct device *dev,
138} 138}
139 139
140static struct twl4030_gpio_platform_data touchbook_gpio_data = { 140static struct twl4030_gpio_platform_data touchbook_gpio_data = {
141 .gpio_base = OMAP_MAX_GPIO_LINES,
142 .irq_base = TWL4030_GPIO_IRQ_BASE,
143 .irq_end = TWL4030_GPIO_IRQ_END,
144 .use_leds = true, 141 .use_leds = true,
145 .pullups = BIT(1), 142 .pullups = BIT(1),
146 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) 143 .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 3911c13a342a..e37ee6749bed 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -262,7 +262,6 @@ static struct twl6040_codec_data twl6040_codec = {
262static struct twl6040_platform_data twl6040_data = { 262static struct twl6040_platform_data twl6040_data = {
263 .codec = &twl6040_codec, 263 .codec = &twl6040_codec,
264 .audpwron_gpio = 127, 264 .audpwron_gpio = 127,
265 .irq_base = TWL6040_CODEC_IRQ_BASE,
266}; 265};
267 266
268/* Panda board uses the common PMIC configuration */ 267/* Panda board uses the common PMIC configuration */
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 193d1608b39a..4754f051b91a 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -398,9 +398,6 @@ static int overo_twl_gpio_setup(struct device *dev,
398} 398}
399 399
400static struct twl4030_gpio_platform_data overo_gpio_data = { 400static struct twl4030_gpio_platform_data overo_gpio_data = {
401 .gpio_base = OMAP_MAX_GPIO_LINES,
402 .irq_base = TWL4030_GPIO_IRQ_BASE,
403 .irq_end = TWL4030_GPIO_IRQ_END,
404 .use_leds = true, 401 .use_leds = true,
405 .setup = overo_twl_gpio_setup, 402 .setup = overo_twl_gpio_setup,
406}; 403};
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 0ad1bb3bdb98..12411b9fa88c 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -72,9 +72,6 @@ static struct platform_device *rm680_peripherals_devices[] __initdata = {
72 72
73/* TWL */ 73/* TWL */
74static struct twl4030_gpio_platform_data rm680_gpio_data = { 74static struct twl4030_gpio_platform_data rm680_gpio_data = {
75 .gpio_base = OMAP_MAX_GPIO_LINES,
76 .irq_base = TWL4030_GPIO_IRQ_BASE,
77 .irq_end = TWL4030_GPIO_IRQ_END,
78 .pullups = BIT(0), 75 .pullups = BIT(0),
79 .pulldowns = BIT(1) | BIT(2) | BIT(8) | BIT(15), 76 .pulldowns = BIT(1) | BIT(2) | BIT(8) | BIT(15),
80}; 77};
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 3b9fc6105329..e8b6dda85945 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -773,9 +773,6 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
773} 773}
774 774
775static struct twl4030_gpio_platform_data rx51_gpio_data = { 775static struct twl4030_gpio_platform_data rx51_gpio_data = {
776 .gpio_base = OMAP_MAX_GPIO_LINES,
777 .irq_base = TWL4030_GPIO_IRQ_BASE,
778 .irq_end = TWL4030_GPIO_IRQ_END,
779 .pulldowns = BIT(0) | BIT(1) | BIT(2) | BIT(3) 776 .pulldowns = BIT(0) | BIT(1) | BIT(2) | BIT(3)
780 | BIT(4) | BIT(5) 777 | BIT(4) | BIT(5)
781 | BIT(8) | BIT(9) | BIT(10) | BIT(11) 778 | BIT(8) | BIT(9) | BIT(10) | BIT(11)
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index b797cb279618..00f73b7792e0 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -251,9 +251,6 @@ static void zoom2_set_hs_extmute(int mute)
251} 251}
252 252
253static struct twl4030_gpio_platform_data zoom_gpio_data = { 253static struct twl4030_gpio_platform_data zoom_gpio_data = {
254 .gpio_base = OMAP_MAX_GPIO_LINES,
255 .irq_base = TWL4030_GPIO_IRQ_BASE,
256 .irq_end = TWL4030_GPIO_IRQ_END,
257 .setup = zoom_twl_gpio_setup, 254 .setup = zoom_twl_gpio_setup,
258}; 255};
259 256
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 09:32:08 -0500