summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-pca100.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-05 10:12:28 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-07-01 21:57:16 +0800
commit438196c371cb32f0eacaf2a44166d9a0cf37c4a8 (patch)
tree8e502f38302ba1226444c73aaa84aae86464583f /arch/arm/mach-imx/mach-pca100.c
parented175343b4b53d686e30b1e37fb94e142f56fa2f (diff)
downloadblackbird-op-linux-438196c371cb32f0eacaf2a44166d9a0cf37c4a8.tar.gz
blackbird-op-linux-438196c371cb32f0eacaf2a44166d9a0cf37c4a8.zip
ARM: imx: eliminate macro IRQ_GPIOx()
This patch changes all the static gpio irq number assigning with IRQ_GPIOA() ... IRQ_GPIOF() to run-time assigning with gpio_to_irq call, and in turn eliminates these macros. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r--arch/arm/mach-imx/mach-pca100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 541152e450c4..8b1dfa277fd5 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -245,7 +245,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq,
{
int ret;
- ret = request_irq(IRQ_GPIOC(29), detect_irq,
+ ret = request_irq(gpio_to_irq(IMX_GPIO_NR(3, 29)), detect_irq,
IRQF_DISABLED | IRQF_TRIGGER_FALLING,
"imx-mmc-detect", data);
if (ret)
@@ -257,7 +257,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq,
static void pca100_sdhc2_exit(struct device *dev, void *data)
{
- free_irq(IRQ_GPIOC(29), data);
+ free_irq(gpio_to_irq(IMX_GPIO_NR(3, 29)), data);
}
static const struct imxmmc_platform_data sdhc_pdata __initconst = {
OpenPOWER on IntegriCloud