From 6a23311a0cb8d67ae174b58616a68be18d3ab208 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Thu, 8 Nov 2012 14:51:00 +0800 Subject: [PATCH] rk30: irq_base use IRQ_BOARD_BASE --- arch/arm/mach-rk30/board-pmu-tps65910.c | 2 +- arch/arm/mach-rk30/board-pmu-wm8326.c | 2 +- arch/arm/mach-rk30/board-rk30-ds1001b-wm8326.c | 2 +- arch/arm/mach-rk30/board-rk30-phone-twl60xx.c | 2 +- arch/arm/mach-rk30/board-rk30-phone-wm831x.c | 2 +- arch/arm/mach-rk30/board-rk30-sdk-tps65910.c | 2 +- arch/arm/mach-rk30/board-rk30-sdk-twl80032.c | 2 +- arch/arm/mach-rk30/board-rk30-sdk-wm8326.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c index 92db7c511754..ca3762bac09b 100755 --- a/arch/arm/mach-rk30/board-pmu-tps65910.c +++ b/arch/arm/mach-rk30/board-pmu-tps65910.c @@ -571,7 +571,7 @@ void __sramfunc board_pmu_tps65910_resume(void) } static struct tps65910_board tps65910_data = { .irq = (unsigned)TPS65910_HOST_IRQ, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, .gpio_base = TPS65910_GPIO_EXPANDER_BASE, .pre_init = tps65910_pre_init, diff --git a/arch/arm/mach-rk30/board-pmu-wm8326.c b/arch/arm/mach-rk30/board-pmu-wm8326.c index 7b47bde55ac5..0e34c92764b5 100755 --- a/arch/arm/mach-rk30/board-pmu-wm8326.c +++ b/arch/arm/mach-rk30/board-pmu-wm8326.c @@ -801,7 +801,7 @@ static struct wm831x_pdata wm831x_platdata = { .settinginfo = wm831x_gpio_settinginfo, .settinginfolen = ARRAY_SIZE(wm831x_gpio_settinginfo), .pin_type_init = wm831x_init_pin_type, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, #endif /** LED1 = 0 and so on */ diff --git a/arch/arm/mach-rk30/board-rk30-ds1001b-wm8326.c b/arch/arm/mach-rk30/board-rk30-ds1001b-wm8326.c index ce3050e7e6df..ceff4a3f6ac6 100755 --- a/arch/arm/mach-rk30/board-rk30-ds1001b-wm8326.c +++ b/arch/arm/mach-rk30/board-rk30-ds1001b-wm8326.c @@ -807,7 +807,7 @@ static struct wm831x_pdata wm831x_platdata = { .settinginfo = wm831x_gpio_settinginfo, .settinginfolen = ARRAY_SIZE(wm831x_gpio_settinginfo), .pin_type_init = wm831x_init_pin_type, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, #endif /** LED1 = 0 and so on */ diff --git a/arch/arm/mach-rk30/board-rk30-phone-twl60xx.c b/arch/arm/mach-rk30/board-rk30-phone-twl60xx.c index e4b54ef1577a..8733d5259c3f 100755 --- a/arch/arm/mach-rk30/board-rk30-phone-twl60xx.c +++ b/arch/arm/mach-rk30/board-rk30-phone-twl60xx.c @@ -21,7 +21,7 @@ #define GPIO6_PB1_EN_MASK 0x02000200 #define GPIO6_PB1_UNEN_MASK 0x02000000 -#define TWL60xx_IRQ_BASE (NR_GIC_IRQS + NR_GPIO_IRQS ) +#define TWL60xx_IRQ_BASE IRQ_BOARD_BASE #ifdef CONFIG_TWL4030_CORE #define TWL60xx_BASE_NR_IRQS 24 #else diff --git a/arch/arm/mach-rk30/board-rk30-phone-wm831x.c b/arch/arm/mach-rk30/board-rk30-phone-wm831x.c index 7426796dc56c..8b2dc4ced84e 100755 --- a/arch/arm/mach-rk30/board-rk30-phone-wm831x.c +++ b/arch/arm/mach-rk30/board-rk30-phone-wm831x.c @@ -838,7 +838,7 @@ static struct wm831x_pdata wm831x_platdata = { .settinginfo = wm831x_gpio_settinginfo, .settinginfolen = ARRAY_SIZE(wm831x_gpio_settinginfo), .pin_type_init = wm831x_init_pin_type, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, #endif .backlight = &wm831x_backlight_platdata, diff --git a/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c b/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c index 56f86dcb14be..6d4d79812f69 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c @@ -619,7 +619,7 @@ void __sramfunc board_pmu_tps65910_resume(void) static struct tps65910_board tps65910_data = { .irq = (unsigned)TPS65910_HOST_IRQ, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, .gpio_base = TPS65910_GPIO_EXPANDER_BASE, .pre_init = tps65910_pre_init, diff --git a/arch/arm/mach-rk30/board-rk30-sdk-twl80032.c b/arch/arm/mach-rk30/board-rk30-sdk-twl80032.c index 9961dd0a51ce..638bbbd7f86b 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-twl80032.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-twl80032.c @@ -3,7 +3,7 @@ #include -#define TWL60xx_IRQ_BASE (NR_GIC_IRQS + NR_GPIO_IRQS ) +#define TWL60xx_IRQ_BASE IRQ_BOARD_BASE #ifdef CONFIG_TWL4030_CORE #define TWL60xx_BASE_NR_IRQS 24 #else diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c index ac7108154434..9bec42acd3ea 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c @@ -914,7 +914,7 @@ static struct wm831x_pdata wm831x_platdata = { .settinginfo = wm831x_gpio_settinginfo, .settinginfolen = ARRAY_SIZE(wm831x_gpio_settinginfo), .pin_type_init = wm831x_init_pin_type, - .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, + .irq_base = IRQ_BOARD_BASE, #endif /** LED1 = 0 and so on */ -- 2.34.1