rk30: irq_base use IRQ_BOARD_BASE

diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c
index 92db7c51175462febdcb98f0c173387283257df5..ca3762bac09b365d51a804b78c179c37d8dd6446 100755 (executable)
--- 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 7b47bde55ac5b8311947d94f52eb9d2428b92635..0e34c92764b5949291f1fcccdf621fbce4e09373 100755 (executable)
--- 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 ce3050e7e6df8dfaa58edc2cf516324ebd0895dd..ceff4a3f6ac6531bcddc6ce9f5b25d021a21d710 100755 (executable)
--- 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 e4b54ef1577a9fe60847621bd129949dffee5894..8733d5259c3f31cc1e36578d77834f417ea5652c 100755 (executable)
--- 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 7426796dc56c246600549ac39c1c178078632ba4..8b2dc4ced84eba151bb302d6e536a1f2f65a9d25 100755 (executable)
--- 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 56f86dcb14be4e3dd97295b8004d75e6adea979c..6d4d79812f69c8509cec7a78648c96fe3f50c250 100755 (executable)
--- 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 9961dd0a51ce4a235d9e7fb2ab11250b6212fc2f..638bbbd7f86b3d457e6ec61632edb6b85cd36713 100755 (executable)
--- 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 <mach/sram.h>
 
-#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 ac710815443442f5ea7bbf21c306214e19c3937d..9bec42acd3eafc8ae906cc2c0ebec4829b5b736c 100755 (executable)
--- 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 */