[patch 2.6.28-rc5 5/5] twl4030 cleanup symbols and OMAP dependency

[patch 2.6.28-rc5 5/5] twl4030 cleanup symbols and OMAP dependency

[David Brownell]

From: David Brownell <dbrownell@users.sourceforge.net>

Finish removing dependency of TWL driver stack on platform-specific 
IRQ definitions ... and remove the build dependency on OMAP.

This lets the TWL4030 code be included in test builds for most
platforms, and will make it easier for non-OMAP folk to update
most of this code for new APIs etc.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
 drivers/mfd/Kconfig         |    2 +-
 include/linux/i2c/twl4030.h |   32 --------------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -63,7 +63,7 @@ config UCB1400_CORE
 
 config TWL4030_CORE
 	bool "Texas Instruments TWL4030/TPS659x0 Support"
-	depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
+	depends on I2C=y && GENERIC_HARDIRQS
 	help
 	  Say yes here if you have TWL4030 family chip on your board.
 	  This core driver provides register access and IRQ handling
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -363,33 +363,6 @@ struct twl4030_platform_data {
 
 int twl4030_sih_setup(int module);
 
-/*
- * FIXME completely stop using TWL4030_IRQ_BASE ... instead, pass the
- * IRQ data to subsidiary devices using platform device resources.
- */
-
-/* IRQ information-need base */
-#include <mach/irqs.h>
-/* TWL4030 interrupts */
-
-/* #define TWL4030_MODIRQ_GPIO		(TWL4030_IRQ_BASE + 0) */
-/* #define TWL4030_MODIRQ_KEYPAD		(TWL4030_IRQ_BASE + 1) */
-/* #define TWL4030_MODIRQ_BCI		(TWL4030_IRQ_BASE + 2) */
-/* #define TWL4030_MODIRQ_MADC		(TWL4030_IRQ_BASE + 3) */
-/* #define TWL4030_MODIRQ_USB		(TWL4030_IRQ_BASE + 4) */
-/* #define TWL4030_MODIRQ_PWR		(TWL4030_IRQ_BASE + 5) */
-
-/* #define TWL4030_PWRIRQ_PWRBTN		(TWL4030_PWR_IRQ_BASE + 0) */
-/* #define TWL4030_PWRIRQ_CHG_PRES		(TWL4030_PWR_IRQ_BASE + 1) */
-/* #define TWL4030_PWRIRQ_USB_PRES		(TWL4030_PWR_IRQ_BASE + 2) */
-/* #define TWL4030_PWRIRQ_RTC		(TWL4030_PWR_IRQ_BASE + 3) */
-/* #define TWL4030_PWRIRQ_HOT_DIE		(TWL4030_PWR_IRQ_BASE + 4) */
-/* #define TWL4030_PWRIRQ_PWROK_TIMEOUT	(TWL4030_PWR_IRQ_BASE + 5) */
-/* #define TWL4030_PWRIRQ_MBCHG		(TWL4030_PWR_IRQ_BASE + 6) */
-/* #define TWL4030_PWRIRQ_SC_DETECT	(TWL4030_PWR_IRQ_BASE + 7) */
-
-/* Rest are unsued currently*/
-
 /* Offsets to Power Registers */
 #define TWL4030_VDAC_DEV_GRP		0x3B
 #define TWL4030_VDAC_DEDICATED		0x3E
@@ -400,11 +373,6 @@ int twl4030_sih_setup(int module);
 #define TWL4030_VAUX3_DEV_GRP		0x1F
 #define TWL4030_VAUX3_DEDICATED		0x22
 
-/* TWL4030 GPIO interrupt definitions */
-
-#define TWL4030_GPIO_IRQ_NO(n)		(TWL4030_GPIO_IRQ_BASE + (n))
-
-
 #if defined(CONFIG_TWL4030_BCI_BATTERY) || \
 	defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
 	extern int twl4030charger_usb_en(int enable);

Re: [patch 2.6.28-rc5 5/5] twl4030 cleanup symbols and OMAP dependency

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [081119 17:35]:
> From: David Brownell <dbrownell@users.sourceforge.net>
> 
> Finish removing dependency of TWL driver stack on platform-specific 
> IRQ definitions ... and remove the build dependency on OMAP.
> 
> This lets the TWL4030 code be included in test builds for most
> platforms, and will make it easier for non-OMAP folk to update
> most of this code for new APIs etc.

Pushing to l-o tree today.

Tony

> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
> ---
>  drivers/mfd/Kconfig         |    2 +-
>  include/linux/i2c/twl4030.h |   32 --------------------------------
>  2 files changed, 1 insertion(+), 33 deletions(-)
> 
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -63,7 +63,7 @@ config UCB1400_CORE
>  
>  config TWL4030_CORE
>  	bool "Texas Instruments TWL4030/TPS659x0 Support"
> -	depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
> +	depends on I2C=y && GENERIC_HARDIRQS
>  	help
>  	  Say yes here if you have TWL4030 family chip on your board.
>  	  This core driver provides register access and IRQ handling
> --- a/include/linux/i2c/twl4030.h
> +++ b/include/linux/i2c/twl4030.h
> @@ -363,33 +363,6 @@ struct twl4030_platform_data {
>  
>  int twl4030_sih_setup(int module);
>  
> -/*
> - * FIXME completely stop using TWL4030_IRQ_BASE ... instead, pass the
> - * IRQ data to subsidiary devices using platform device resources.
> - */
> -
> -/* IRQ information-need base */
> -#include <mach/irqs.h>
> -/* TWL4030 interrupts */
> -
> -/* #define TWL4030_MODIRQ_GPIO		(TWL4030_IRQ_BASE + 0) */
> -/* #define TWL4030_MODIRQ_KEYPAD		(TWL4030_IRQ_BASE + 1) */
> -/* #define TWL4030_MODIRQ_BCI		(TWL4030_IRQ_BASE + 2) */
> -/* #define TWL4030_MODIRQ_MADC		(TWL4030_IRQ_BASE + 3) */
> -/* #define TWL4030_MODIRQ_USB		(TWL4030_IRQ_BASE + 4) */
> -/* #define TWL4030_MODIRQ_PWR		(TWL4030_IRQ_BASE + 5) */
> -
> -/* #define TWL4030_PWRIRQ_PWRBTN		(TWL4030_PWR_IRQ_BASE + 0) */
> -/* #define TWL4030_PWRIRQ_CHG_PRES		(TWL4030_PWR_IRQ_BASE + 1) */
> -/* #define TWL4030_PWRIRQ_USB_PRES		(TWL4030_PWR_IRQ_BASE + 2) */
> -/* #define TWL4030_PWRIRQ_RTC		(TWL4030_PWR_IRQ_BASE + 3) */
> -/* #define TWL4030_PWRIRQ_HOT_DIE		(TWL4030_PWR_IRQ_BASE + 4) */
> -/* #define TWL4030_PWRIRQ_PWROK_TIMEOUT	(TWL4030_PWR_IRQ_BASE + 5) */
> -/* #define TWL4030_PWRIRQ_MBCHG		(TWL4030_PWR_IRQ_BASE + 6) */
> -/* #define TWL4030_PWRIRQ_SC_DETECT	(TWL4030_PWR_IRQ_BASE + 7) */
> -
> -/* Rest are unsued currently*/
> -
>  /* Offsets to Power Registers */
>  #define TWL4030_VDAC_DEV_GRP		0x3B
>  #define TWL4030_VDAC_DEDICATED		0x3E
> @@ -400,11 +373,6 @@ int twl4030_sih_setup(int module);
>  #define TWL4030_VAUX3_DEV_GRP		0x1F
>  #define TWL4030_VAUX3_DEDICATED		0x22
>  
> -/* TWL4030 GPIO interrupt definitions */
> -
> -#define TWL4030_GPIO_IRQ_NO(n)		(TWL4030_GPIO_IRQ_BASE + (n))
> -
> -
>  #if defined(CONFIG_TWL4030_BCI_BATTERY) || \
>  	defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
>  	extern int twl4030charger_usb_en(int enable);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html