Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a940d9a1 authored Sep 04, 2012 by Tony Lindgren

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>

parent 714df7b8

arch/arm/mach-omap2/board-2430sdp.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -211,9 +211,6 @@ static struct regulator_init_data sdp2430_vmmc1 = {
	};		};

	static struct twl4030_gpio_platform_data sdp2430_gpio_data = {		static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
	.gpio_base = OMAP_MAX_GPIO_LINES,
	.irq_base = TWL4030_GPIO_IRQ_BASE,
	.irq_end = TWL4030_GPIO_IRQ_END,
	};		};

	static struct twl4030_platform_data sdp2430_twldata = {		static struct twl4030_platform_data sdp2430_twldata = {

arch/arm/mach-omap2/board-3430sdp.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -229,9 +229,6 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
	}		}

	static struct twl4030_gpio_platform_data sdp3430_gpio_data = {		static struct twl4030_gpio_platform_data sdp3430_gpio_data = {
	.gpio_base = OMAP_MAX_GPIO_LINES,
	.irq_base = TWL4030_GPIO_IRQ_BASE,
	.irq_end = TWL4030_GPIO_IRQ_END,
	.pulldowns = BIT(2) \| BIT(6) \| BIT(8) \| BIT(13)		.pulldowns = BIT(2) \| BIT(6) \| BIT(8) \| BIT(13)
	\| BIT(16) \| BIT(17),		\| BIT(16) \| BIT(17),
	.setup = sdp3430_twl_gpio_setup,		.setup = sdp3430_twl_gpio_setup,

arch/arm/mach-omap2/board-4430sdp.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -543,7 +543,6 @@ static struct twl6040_platform_data twl6040_data = {
	.codec = &twl6040_codec,		.codec = &twl6040_codec,
	.vibra = &twl6040_vibra,		.vibra = &twl6040_vibra,
	.audpwron_gpio = 127,		.audpwron_gpio = 127,
	.irq_base = TWL6040_CODEC_IRQ_BASE,
	};		};

	static struct twl4030_platform_data sdp4430_twldata = {		static struct twl4030_platform_data sdp4430_twldata = {

arch/arm/mach-omap2/board-cm-t35.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -469,9 +469,6 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
	}		}

	static struct twl4030_gpio_platform_data cm_t35_gpio_data = {		static struct twl4030_gpio_platform_data cm_t35_gpio_data = {
	.gpio_base = OMAP_MAX_GPIO_LINES,
	.irq_base = TWL4030_GPIO_IRQ_BASE,
	.irq_end = TWL4030_GPIO_IRQ_END,
	.setup = cm_t35_twl_gpio_setup,		.setup = cm_t35_twl_gpio_setup,
	};		};

arch/arm/mach-omap2/board-devkit8000.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -235,9 +235,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
	}		}

	static struct twl4030_gpio_platform_data devkit8000_gpio_data = {		static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
	.gpio_base = OMAP_MAX_GPIO_LINES,
	.irq_base = TWL4030_GPIO_IRQ_BASE,
	.irq_end = TWL4030_GPIO_IRQ_END,
	.use_leds = true,		.use_leds = true,
	.pulldowns = BIT(1) \| BIT(2) \| BIT(6) \| BIT(8) \| BIT(13)		.pulldowns = BIT(1) \| BIT(2) \| BIT(6) \| BIT(8) \| BIT(13)
	\| BIT(15) \| BIT(16) \| BIT(17),		\| BIT(15) \| BIT(16) \| BIT(17),