Skip to contentSkip to conversation

remove some gllobal twl4030 IRQ defines

PATCH In review David Brownell 2 participants 3 messages Oct 10, 2008 – Oct 11, 2008

Subsystems (2)
Multifunction devices (MFD) OMAP2+ support
lore
Share & tools
lore

David Brownell

author
#0 lore raw

PATCH 6/6 remove some gllobal twl4030 IRQ defines

From: David Brownell <[email protected]>

Disable more unnecessary TWL4030_*IRQ_* symbols.

We're not yet ready to remove them all from <linux/i2c/twl4030.h> since various drivers still use those symbols (maybe indirectly) not platform resources: twl4030_bci_battery.c, twl4030-madc.c, twl4030-pwrbutton.c, and omap-twl4030keypad.c all need updates.

Signed-off-by David Brownell <[email protected]>
---
 drivers/mfd/twl4030-core.c  |   13 +++++++++----
 include/linux/i2c/twl4030.h |   16 ++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)
drivers/mfd/twl4030-core.c +9 -4
@@ -352,6 +352,12 @@ EXPORT_SYMBOL(twl4030_i2c_read_u8);
 
 /*----------------------------------------------------------------------*/
 
+/*
+ * NOTE:  We know the first 8 IRQs after pdata->base_irq are
+ * for the PIH, and the next are for the PWR_INT SIH, since
+ * that's how twl_init_irq() sets things up.
+ */
+
 static int add_children(struct twl4030_platform_data *pdata)
 {
 	struct platform_device	*pdev = NULL;

@@ -382,7 +388,7 @@ static int add_children(struct twl4030_p
 
 		if (status == 0) {
 			struct resource r = {
-				.start = TWL4030_PWRIRQ_CHG_PRES,
+				.start = pdata->irq_base + 8 + 1,
 				.flags = IORESOURCE_IRQ,
 			};
 

@@ -531,8 +537,7 @@ static int add_children(struct twl4030_p
 		/* RTC module IRQ */
 		if (status == 0) {
 			struct resource	r = {
-				/* REVISIT don't hard-wire this stuff */
-				.start = TWL4030_PWRIRQ_RTC,
+				.start = pdata->irq_base + 8 + 3,
 				.flags = IORESOURCE_IRQ,
 			};
 

@@ -577,7 +582,7 @@ static int add_children(struct twl4030_p
 
 		if (status == 0) {
 			struct resource r = {
-				.start = TWL4030_PWRIRQ_USB_PRES,
+				.start = pdata->irq_base + 8 + 2,
 				.flags = IORESOURCE_IRQ,
 			};
include/linux/i2c/twl4030.h +8 -8
@@ -293,16 +293,16 @@ int twl4030_sih_setup(int module);
 #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_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)
+/* #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*/
author
#2 lore raw
Quoted 1 line · Felipe Contreras

s/gllobal/global/

I was fending off an attack by a gang of homeless llamas as I wrote that ... ;)