Adding missing #defines for TWL4030 Signed-off-by: Francisco Alecrim <francisco.alecrim@xxxxxxxxxxx> --- include/asm-arm/arch-omap/board-2430osk.h | 13 ++++++++++--- include/asm-arm/arch-omap/board-2430sdp.h | 12 ++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/asm-arm/arch-omap/board-2430osk.h b/include/asm-arm/arch-omap/board-2430osk.h index e5b63ae..fcb1a2a 100644 --- a/include/asm-arm/arch-omap/board-2430osk.h +++ b/include/asm-arm/arch-omap/board-2430osk.h @@ -39,9 +39,16 @@ #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 /* __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 186e9cc..1a5414e 100644 --- a/include/asm-arm/arch-omap/board-2430sdp.h +++ b/include/asm-arm/arch-omap/board-2430sdp.h @@ -40,10 +40,18 @@ #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 */ /* Function prototypes */ extern void sdp2430_flash_init(void); -- 1.5.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
