OMAP2430: Add missing defines for TWL4030

This patch adds missing defines for TWL4030.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/include/asm-arm/arch-omap/board-2430osk.h b/include/asm-arm/arch-omap/board-2430osk.h
index e5b63aeb3152656f800e26e1354317dfc49dc68e..14c996eb454110be2dab63507a3b2a783b73ab24 100644 (file)
--- a/include/asm-arm/arch-omap/board-2430osk.h
+++ b/include/asm-arm/arch-omap/board-2430osk.h
@@ -33,15 +33,26 @@
 #define OMAP24XX_ETHR_START            0x08000300
 #define OMAP24XX_ETHR_GPIO_IRQ         149
 
+#ifdef CONFIG_TWL4030_CORE
+
 #define TWL4030_IRQNUM                 INT_24XX_SYS_NIRQ
 
 /* TWL4030 Primary Interrupt Handler (PIH) interrupts */
 #define IH_TWL4030_BASE                        IH_BOARD_BASE
 #define IH_TWL4030_END                 (IH_TWL4030_BASE+8)
 
+#define IH_TWL4030_PWRBASE             (IH_TWL4030_END)
+#define IH_TWL4030_PWRBASE_END         (IH_TWL4030_PWRBASE+8)
+
+#ifdef CONFIG_TWL4030_GPIO
+
 /* TWL4030 GPIO Interrupts */
-#define IH_TWL4030_GPIO_BASE           (IH_TWL4030_END)
-#define IH_TWL4030_GPIO_END            (IH_TWL4030_BASE+18)
+#define IH_TWL4030_GPIO_BASE           (IH_TWL4030_PWRBASE_END)
+#define IH_TWL4030_GPIO_END            (IH_TWL4030_GPIO_BASE+18)
 #define NR_IRQS                                (IH_TWL4030_GPIO_END)
+#else
+#define NR_IRQS                                (IH_TWL4030_PWRBASE_END)
+#endif /* CONFIG_I2C_TWL4030_GPIO */
+#endif /* End of support for TWL4030 */
 
 #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 186e9cc6d707d81f32d83f4fb052e66814882eb4..217f197e744c1e19262a68de141f77ee5963da0f 100644 (file)
--- a/include/asm-arm/arch-omap/board-2430sdp.h
+++ b/include/asm-arm/arch-omap/board-2430sdp.h
@@ -34,16 +34,27 @@
 #define OMAP24XX_ETHR_GPIO_IRQ         149
 #define SDP2430_CS0_BASE               0x04000000
 
+#ifdef CONFIG_TWL4030_CORE
+
 #define TWL4030_IRQNUM                 INT_24XX_SYS_NIRQ
 
 /* TWL4030 Primary Interrupt Handler (PIH) interrupts */
 #define IH_TWL4030_BASE                        IH_BOARD_BASE
 #define IH_TWL4030_END                 (IH_TWL4030_BASE+8)
 
+#define IH_TWL4030_PWRBASE             (IH_TWL4030_END)
+#define IH_TWL4030_PWRBASE_END         (IH_TWL4030_PWRBASE+8)
+
+#ifdef CONFIG_TWL4030_GPIO
+
 /* TWL4030 GPIO Interrupts */
-#define IH_TWL4030_GPIO_BASE           (IH_TWL4030_END)
-#define IH_TWL4030_GPIO_END            (IH_TWL4030_BASE+18)
+#define IH_TWL4030_GPIO_BASE           (IH_TWL4030_PWRBASE_END)
+#define IH_TWL4030_GPIO_END            (IH_TWL4030_GPIO_BASE+18)
 #define NR_IRQS                                (IH_TWL4030_GPIO_END)
+#else
+#define NR_IRQS                                (IH_TWL4030_PWRBASE_END)
+#endif /* CONFIG_I2C_TWL4030_GPIO */
+#endif /* End of support for TWL4030 */
 
 /* Function prototypes */
 extern void sdp2430_flash_init(void);