twl4030: Set irq number based upon cpu type rather than requiring #define in board...

Set twl4030 irq number based upon cpu type rather than requiring
#define in board.h files

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
index 1a4c468..b8ee8e1 100644 (file)
--- a/drivers/i2c/chips/twl4030-core.c
+++ b/drivers/i2c/chips/twl4030-core.c
@@ -716,6 +716,7 @@ static void twl_init_irq(void)
        int     i = 0;
        int     res = 0;
        char    *msg = "Unable to register interrupt subsystem";
+       unsigned int irq_num;
 
        /*
         * We end up with interrupts from other modules before
@@ -880,10 +881,12 @@ static void twl_init_irq(void)
                set_irq_flags(i, IRQF_VALID);
        }
 
+       irq_num = (cpu_is_omap2430()) ? INT_24XX_SYS_NIRQ : INT_34XX_SYS_NIRQ;
+
        /* install an irq handler to demultiplex the TWL4030 interrupt */
-       set_irq_data(TWL4030_IRQNUM, start_twl4030_irq_thread(TWL4030_IRQNUM));
-       set_irq_type(TWL4030_IRQNUM, IRQT_FALLING);
-       set_irq_chained_handler(TWL4030_IRQNUM, do_twl4030_irq);
+       set_irq_data(irq_num, start_twl4030_irq_thread(irq_num));
+       set_irq_type(irq_num, IRQT_FALLING);
+       set_irq_chained_handler(irq_num, do_twl4030_irq);
 
        res = power_companion_init();
        if (res < 0)

diff --git a/include/asm-arm/arch-omap/board-2430osk.h b/include/asm-arm/arch-omap/board-2430osk.h
index f7dddc6..3b61bc1 100644 (file)
--- a/include/asm-arm/arch-omap/board-2430osk.h
+++ b/include/asm-arm/arch-omap/board-2430osk.h
@@ -33,6 +33,4 @@
 #define OMAP24XX_ETHR_START            0x08000300
 #define OMAP24XX_ETHR_GPIO_IRQ         149
 
-#define TWL4030_IRQNUM                 INT_24XX_SYS_NIRQ
-
 #endif /* __ASM_ARCH_OMAP_2430OSK_H */

diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/include/asm-arm/arch-omap/board-2430sdp.h
index b308e88..fde6915 100644 (file)
--- a/include/asm-arm/arch-omap/board-2430sdp.h
+++ b/include/asm-arm/arch-omap/board-2430sdp.h
@@ -34,8 +34,6 @@
 #define OMAP24XX_ETHR_GPIO_IRQ         149
 #define SDP2430_CS0_BASE               0x04000000
 
-#define TWL4030_IRQNUM                 INT_24XX_SYS_NIRQ
-
 /* Function prototypes */
 extern void sdp2430_flash_init(void);
 extern void sdp2430_usb_init(void);

diff --git a/include/asm-arm/arch-omap/board-3430sdp.h b/include/asm-arm/arch-omap/board-3430sdp.h
index 77f8647..8c166c2 100644 (file)
--- a/include/asm-arm/arch-omap/board-3430sdp.h
+++ b/include/asm-arm/arch-omap/board-3430sdp.h
@@ -66,7 +66,5 @@ extern void sdp3430_usb_init(void);
 #define FLASH_SIZE_SDPV1       SZ_64M
 #define FLASH_SIZE_SDPV2       SZ_128M
 
-#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ
-
 #endif /* __ASM_ARCH_OMAP_3430SDP_H */
 

diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h
index 14db589..46dff31 100644 (file)
--- a/include/asm-arm/arch-omap/board-omap3beagle.h
+++ b/include/asm-arm/arch-omap/board-omap3beagle.h
@@ -29,7 +29,5 @@
 #ifndef __ASM_ARCH_OMAP3_BEAGLE_H
 #define __ASM_ARCH_OMAP3_BEAGLE_H
 
-#define TWL4030_IRQNUM         INT_34XX_SYS_NIRQ
-
 #endif /* __ASM_ARCH_OMAP3_BEAGLE_H */
 

diff --git a/include/asm-arm/arch-omap/board-omap3evm.h b/include/asm-arm/arch-omap/board-omap3evm.h
index c8f2446..b9d3752 100644 (file)
--- a/include/asm-arm/arch-omap/board-omap3evm.h
+++ b/include/asm-arm/arch-omap/board-omap3evm.h
@@ -31,8 +31,6 @@
 
 extern void omap3evm_flash_init(void);
 
-#define TWL4030_IRQNUM         INT_34XX_SYS_NIRQ
-
 #define ONENAND_MAP            0x20000000
 
 #endif /* __ASM_ARCH_OMAP3_EVM_H */