Merge "YAFFA (Yet Another Fix For Alarm), this time removing the sys_nirq pin from pad_wkup in device tree. Also fixing i2c-1s pin address and some spelling and indentation issues." into android-3.10-bringupstaging

2 files changed, 63 insertions, 62 deletions

diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index 5e6f915499a..8a909944034 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -97,11 +97,9 @@
 		/*                                                    */
 		/*             off  IRQ handle                        */
 
-		ti,pad_irq = <0x150  88  1>, /* 72 + 16, uart1 - BT input      */
-			<0x9f6  143 1>, /* mpu6515 irq pin - is this offset correct?      */
-			/* <0x9ea  122 1>, */ /* bq27400 chg irq8 - needed here? */
-			<0x9f4  123 1>, /* BT host wake          */
-			<0x1b0  23  1>; /* sys_nirq / gpio 0 - rtc alarm  */
+		ti,pad_irq = <0x150  88  1>, /* 72 + 16, uart1 - BT input */
+			<0x9f6  143 1>, /* mpu6515 irq pin - is this offset correct? */
+			<0x9f4  123 1>; /* BT host wake          */
 	};
 	
 	sound {
@@ -173,7 +171,7 @@
 			0x19c 0x118	/* MCSPI1_SOMI, MODE0 | INPUT_PULLUP */
 			0x1a0 0x000	/* MCSPI1_CS1, MODE0 | OUTPUT */
                         
-            /* CKE pin for memory */
+			/* CKE pin for memory */
 	                0x232 0x000	/* SDRC_CKE0, MODE0 | OUTPUT */
 			0x234 0x000	/* SDRC_CKE1, MODE0 | OUTPUT */
 
@@ -181,55 +179,55 @@
 			0x0f2 0x11c	/* CAM_D6, MODE4 | INPUT_PULLUP */
 
 			0x5ba 0x004	/* ETK_D7, MODE4 | OUTPUT (from GL susp) */
-			                
+
 			0x1b0 0x4118    /* 0xc100 SYS_NIRQ, MODE0 | INPUT | OFFWAKEUP */
 
 			0x0dc 0x004	/* CAM_HS, MODE4 | OUTPUT */
 
-            /* USB */
-
-            0x172 0x100 /* HSUSB0_CLK,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x174 0x000 /* HSUSB0_STP,   (OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT) */
-            0x176 0x100 /* HSUSB0_DIR,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x178 0x100 /* HSUSB0_NXT,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x17a 0x100 /* HSUSB0_DATA0, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x17c 0x100 /* HSUSB0_DATA1, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT   */
-            0x17e 0x100 /* HSUSB0_DATA2, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x180 0x100 /* HSUSB0_DATA3, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x182 0x100 /* HSUSB0_DATA4, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x184 0x100 /* HSUSB0_DATA5, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x186 0x100 /* HSUSB0_DATA6, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-            0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
-
-            /* pin for controlling bluetooth chip, settings from uboot */
-
-            0x1a8 0x004 /* CONTROL_PADCONF_MCSPI2_SIMO, (IDIS | PI | M4 ) */
-            0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */
-
-            /* UART3 pins */
-            0x16e 0x100  /* RX, input, off wake up   */
-            0x170 0x000  /* TX, output */    
-
-            /* GPIO146, aka UART2TX, aka Microphone enable */
-            0x148 0x161C  /* (204)  OUTPUT | GPIO | OFF_ENABLE | OFF_PULL_LOW   */
-                              /*  (0x161C)  0001011000011100 | PULL_ENA | PULL_UP  */
-                              
-            /* Accelerometer interrupt */
-            /* I've tried configuring this both in the wkup pinmux (below) and here,
-             but this location makes it not function as an interrupt... ??? */
-            /* 0x9f6 0x4104 */    /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | 
-                                     OMAP_PIN_OFF_WAKEUPENABLE */
-                           
-            0x14c 0x000     /* UART1, BT, TX  */
-            0x14e 0xA00     /* UART1, BT, RTS - A00 = output off high, this one is active low! */
-            0x150 0x4100    /* UART1, BT, CTS */
-            0x152 0x100     /* UART1, BT, RX  */
-
-            /* BT_WAKE_GPIO - for waking up BT */
-            /* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ 
-            /* Now set this to regular old output .. also off enable, output low. (0x600) */
-            0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */
-	    >;
+			/* USB */
+			
+			0x172 0x100 /* HSUSB0_CLK,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x174 0x000 /* HSUSB0_STP,   (OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT) */
+			0x176 0x100 /* HSUSB0_DIR,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x178 0x100 /* HSUSB0_NXT,   (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x17a 0x100 /* HSUSB0_DATA0, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x17c 0x100 /* HSUSB0_DATA1, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT   */
+			0x17e 0x100 /* HSUSB0_DATA2, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x180 0x100 /* HSUSB0_DATA3, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x182 0x100 /* HSUSB0_DATA4, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x184 0x100 /* HSUSB0_DATA5, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x186 0x100 /* HSUSB0_DATA6, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)  */
+			
+			/* pin for controlling bluetooth chip, settings from uboot */
+			
+			0x1a8 0x004 /* CONTROL_PADCONF_MCSPI2_SIMO, (IDIS | PI | M4 ) */
+			0x1aa 0x004 /* CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 ) */
+			
+			/* UART3 pins */
+			0x16e 0x100  /* RX, input, off wake up   */
+			0x170 0x000  /* TX, output */    
+			
+			/* GPIO146, aka UART2TX, aka Microphone enable */
+			0x148 0x161C  /* (204)  OUTPUT | GPIO | OFF_ENABLE | OFF_PULL_LOW   */
+			/*  (0x161C)  0001011000011100 | PULL_ENA | PULL_UP  */
+			
+			/* Accelerometer interrupt */
+			/* I've tried configuring this both in the wkup pinmux (below) and here,
+			   but this location makes it not function as an interrupt... ??? */
+			/* 0x9f6 0x4104 */    /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | 
+			   OMAP_PIN_OFF_WAKEUPENABLE */
+			
+			0x14c 0x000     /* UART1, BT, TX  */
+			0x14e 0xA00     /* UART1, BT, RTS - A00 = output off high, this one is active low! */
+			0x150 0x4100    /* UART1, BT, CTS */
+			0x152 0x100     /* UART1, BT, RX  */
+			
+			/* BT_WAKE_GPIO - for waking up BT */
+			/* OMAP_OFF_ENABLE, OMAP_OFF_PULL_EN, OMAP_OFF_OUTENABLE for sleep modes. */ 
+			/* Now set this to regular old output .. also off enable, output low. (0x600) */
+			0x0da 0x004 /* 0x1604 */ /* DSS_DATA23, (IDIS | PI | M4 ) */
+			>;
 	};
 
 dev_pins: pinmux_pv_pins {
@@ -252,7 +250,7 @@ dev_pins: pinmux_pv_pins {
 
 	i2c1_pins: pinmux_i2c1_pins {
 		pinctrl-single,pins = <
-			0x188 0x118     /* I2C1_SCL, MODE0 | INPUT_PULLUP */
+			0x18a 0x118     /* I2C1_SCL, MODE0 | INPUT_PULLUP */
 			0x18c 0x118     /* I2C1_SCL, MODE0 | INPUT_PULLUP */
 		>;
 	};
@@ -269,7 +267,7 @@ dev_pins: pinmux_pv_pins {
 	pinctrl-names = "default";
 	pinctrl-0 = <&wkup_pins>;
 
-    wkup_pins: pinmux_wakeup_pins {
+        wkup_pins: pinmux_wakeup_pins {
 		pinctrl-single,pins = <
 			0x006 0x008     /* SYS_CLKREQ, MODE0 | PULLDOWN */
 			0x018 0x000     /* SYS_OFF_MODE, MODE0 */
@@ -284,12 +282,12 @@ dev_pins: pinmux_pv_pins {
 			 */
 			0x058 0x1604
 
-            /* Wakeup from Bluetooth */
-            0x024 0x410C    /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT |
-                             OMAP_PIN_OFF_WAKEUPENABLE */   
-            /* Accelerometer interrupt */
-            0x026 0x410C    /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | 
-                               OMAP_PIN_OFF_WAKEUPENABLE */
+			/* Wakeup from Bluetooth */
+			0x024 0x410C    /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT |
+					   OMAP_PIN_OFF_WAKEUPENABLE */   
+			/* Accelerometer interrupt */
+			0x026 0x410C    /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | 
+					   OMAP_PIN_OFF_WAKEUPENABLE */
             
 		>;
 	};
@@ -313,9 +311,10 @@ dev_pins: pinmux_pv_pins {
 	interrupt-parent = <&intc>;
 	interrupts = <7>;       /* SYS_NIRQ */
 
-        #interrupt-cells = <1>;
-	interrupt-controller;
+        #interrupt-cells = <2>;
 
+	interrupt-controller;
+	
 	/* This is from HEAD */
 	/* ti,en-ck32k-xtal; */
 
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 7d1a1769bb1..94f52d5ef69 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -503,8 +503,10 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
 	board_info->slp_keepon.clkout32k_keepon = prop;
 
 	board_info->irq = client->irq;
+
 	/* board_info->irq_base = -1; */
-	board_info->irq_base = 0; /* OLIO: if (-1) is true ... seems weird. */
+	board_info->irq_base = 0;
+
 	board_info->pm_off = of_property_read_bool(np,
 			"ti,system-power-controller");