From f1d3e896ff72c18acfee44d909ff8f1a885e07da Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 1 Dec 2011 14:49:29 +0800 Subject: [PATCH] --- yaml --- r: 276491 b: refs/heads/master c: 04aafd713bae8a75933c7821dc012b0ec9046bca h: refs/heads/master i: 276489: 59e5931dff417dd7bc72bd78f2455a9770020471 276487: 1b327f4ce073e1fa06d3f0c967427efa5a17d2eb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/mach-imx6q.c | 5 ++--- trunk/arch/arm/mach-mx5/imx51-dt.c | 5 ++--- trunk/arch/arm/mach-mx5/imx53-dt.c | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 53cbc5f6551b..67979848a1cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a3267a489f1dc4284b64a4b88c62011946dc7ff +refs/heads/master: 04aafd713bae8a75933c7821dc012b0ec9046bca diff --git a/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c index eb7531bdfed7..22aa54aa9b2a 100644 --- a/trunk/arch/arm/mach-imx/mach-imx6q.c +++ b/trunk/arch/arm/mach-imx/mach-imx6q.c @@ -39,11 +39,10 @@ static void __init imx6q_map_io(void) static int __init imx6q_gpio_add_irq_domain(struct device_node *np, struct device_node *interrupt_parent) { - static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - - 32 * 7; /* imx6q gets 7 gpio ports */ + static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; + gpio_irq_base -= 32; irq_domain_add_simple(np, gpio_irq_base); - gpio_irq_base += 32; return 0; } diff --git a/trunk/arch/arm/mach-mx5/imx51-dt.c b/trunk/arch/arm/mach-mx5/imx51-dt.c index 3451a463a79a..596edd967dbf 100644 --- a/trunk/arch/arm/mach-mx5/imx51-dt.c +++ b/trunk/arch/arm/mach-mx5/imx51-dt.c @@ -54,11 +54,10 @@ static int __init imx51_tzic_add_irq_domain(struct device_node *np, static int __init imx51_gpio_add_irq_domain(struct device_node *np, struct device_node *interrupt_parent) { - static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - - 32 * 4; /* imx51 gets 4 gpio ports */ + static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; + gpio_irq_base -= 32; irq_domain_add_simple(np, gpio_irq_base); - gpio_irq_base += 32; return 0; } diff --git a/trunk/arch/arm/mach-mx5/imx53-dt.c b/trunk/arch/arm/mach-mx5/imx53-dt.c index 022bc0364b5f..85bfd5ff21b0 100644 --- a/trunk/arch/arm/mach-mx5/imx53-dt.c +++ b/trunk/arch/arm/mach-mx5/imx53-dt.c @@ -58,11 +58,10 @@ static int __init imx53_tzic_add_irq_domain(struct device_node *np, static int __init imx53_gpio_add_irq_domain(struct device_node *np, struct device_node *interrupt_parent) { - static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - - 32 * 7; /* imx53 gets 7 gpio ports */ + static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS; + gpio_irq_base -= 32; irq_domain_add_simple(np, gpio_irq_base); - gpio_irq_base += 32; return 0; }