diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-17 12:31:20 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:06:02 -0500 |
commit | a6c45b99a658521291cfb66ecf035cc58b38f206 (patch) | |
tree | 965842ac249c2b786c54d0fab12008276f419121 /arch/arm/mach-u300 | |
parent | d4a31ee8997b2fbd82837182363cf8fa84abf347 (diff) |
pinctrl/coh901: use irqdomain, allocate irqdescs
This switches the COH 901 pinctrl driver to allocate its GPIO
IRQs dynamically, and start to use a linear irqdomain to map
from the hardware IRQs.
This way we can cut away the complex allocation of IRQ numbers
from the <mach/irqs.h> file.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r-- | arch/arm/mach-u300/core.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 603c08ec8786..ce2de0d6f2eb 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -1445,7 +1445,6 @@ static struct platform_device pinctrl_device = { | |||
1445 | static struct u300_gpio_platform u300_gpio_plat = { | 1445 | static struct u300_gpio_platform u300_gpio_plat = { |
1446 | .ports = 7, | 1446 | .ports = 7, |
1447 | .gpio_base = 0, | 1447 | .gpio_base = 0, |
1448 | .gpio_irq_base = IRQ_U300_GPIO_BASE, | ||
1449 | .pinctrl_device = &pinctrl_device, | 1448 | .pinctrl_device = &pinctrl_device, |
1450 | }; | 1449 | }; |
1451 | 1450 | ||
diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index e85ec3868d04..21d5e76a6cd3 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h | |||
@@ -77,14 +77,4 @@ | |||
77 | #define IRQ_U300_GPIO_PORT6 87 | 77 | #define IRQ_U300_GPIO_PORT6 87 |
78 | #define U300_VIC_IRQS_END 88 | 78 | #define U300_VIC_IRQS_END 88 |
79 | 79 | ||
80 | /* Maximum 8*7 GPIO lines */ | ||
81 | #ifdef CONFIG_PINCTRL_COH901 | ||
82 | #define IRQ_U300_GPIO_BASE (U300_VIC_IRQS_END) | ||
83 | #define IRQ_U300_GPIO_END (IRQ_U300_GPIO_BASE + 56) | ||
84 | #else | ||
85 | #define IRQ_U300_GPIO_END (U300_VIC_IRQS_END) | ||
86 | #endif | ||
87 | |||
88 | #define NR_IRQS_U300 (IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START) | ||
89 | |||
90 | #endif | 80 | #endif |