Fixes for device tree working with Android.

Change-Id: I805137b466a05f85482ff7a7fb3fa2a4b7622ddb

3 files changed, 25 insertions, 18 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4a6b49b8e54..a484cb75fd8 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -269,7 +269,7 @@
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
          }; */
-
+        
 		mcspi1: spi@48098000 {
 			compatible = "ti,omap2-mcspi";
 			#address-cells = <1>;
@@ -322,8 +322,8 @@
 			ti,spi-num-cs = <1>;
 			dmas = <&sdma 70>, <&sdma 71>;
 			dma-names = "tx0", "rx0";
-         };
-
+                };             
+        
 		mmc1: mmc@4809c000 {
 			compatible = "ti,omap3-hsmmc";
 			ti,hwmods = "mmc1";
@@ -344,14 +344,14 @@
 			ti,hwmods = "mmc3";
 			dmas = <&sdma 77>, <&sdma 78>;
 			dma-names = "tx", "rx";
-		};
+         };
 
 		wdt2: wdt@48314000 {
 			compatible = "ti,omap3-wdt";
 			ti,hwmods = "wd_timer2";
 		};
 
-         
+        
 		mcbsp1: mcbsp@48074000 {
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x48074000 0xff>;
@@ -548,14 +548,17 @@
 			/* 	interrupts = <76>; */
 			/* }; */
 
-			usbhsehci: ehci@48064800 {
-				compatible = "ti,ehci-omap", "usb-ehci";
-				reg = <0x48064800 0x400>;
-				interrupt-parent = <&intc>;
-				interrupts = <77>;
-			};
+			/* usbhsehci: ehci@48064800 { */
+			/* 	compatible = "ti,ehci-omap", "usb-ehci"; */
+			/* 	reg = <0x48064800 0x400>; */
+			/* 	interrupt-parent = <&intc>; */
+			/* 	interrupts = <77>; */
+			/* }; */
          };
 
+        /* We're initializing GPMC through the boardfile.*/
+        
+        /*
 		gpmc: gpmc@6e000000 {
 			compatible = "ti,omap3430-gpmc";
 			ti,hwmods = "gpmc";
@@ -565,7 +568,7 @@
 			gpmc,num-waitpins = <4>;
 			#address-cells = <2>;
 			#size-cells = <1>;
-		};
+         };*/
 
         /*
 		usb_otg_hs: usb_otg_hs@480ab000 {
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 0fd78f1b3a4..421b300a777 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -117,7 +117,7 @@ static struct mtd_partition omap3h1_nand_partitions[] = {
 		.size		= 80 * NAND_BLOCK_SIZE,
 	},
 	{
-		.name		= "devicetree",
+		.name		= "ramdisk",
 		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x1180000 */
 		.size		= 40 * NAND_BLOCK_SIZE,
 	},
@@ -388,6 +388,8 @@ static struct regulator_init_data tps65910_3v3 = {
 /* This is the OMAP display subsystem. Part of the OMAP processor OCP stuff.
  * USB also depends on this, so if you want to transfer files it has to be 
  * always on.
+ * NAND flash and UART3 (which we don't use) requires it 
+ * as well. 
  */
 
 static struct regulator_consumer_supply tps65910_1v8_supply[] = {
@@ -409,17 +411,17 @@ static struct regulator_init_data tps65910_1v8 = {
         .state_mem         = {
             .uV = 0,
             .mode = REGULATOR_MODE_STANDBY,
-            .disabled = 1,
+            .enabled = 1,
         },
         .state_disk        = {
             .uV = 0,
             .mode = REGULATOR_MODE_STANDBY,
-            .disabled = 1,
+            .enabled = 1,
         },
         .state_standby     = {
             .uV = 0,
             .mode = REGULATOR_MODE_STANDBY,
-            .disabled = 1,
+            .enabled = 1,
         },
 
     },
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index b9661ea70bb..41b5f574ad0 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -5,10 +5,11 @@
  *
  * License Terms: GNU General Public License v2
  *
- * Simple driver for National Semiconductor LM3530 Backlight driver chip
+ * Simple driver for National Semiconductor LM3530 Backlight driver chip,
+ * with basic suspend and resume.
  *
  * Author: Mattis Fjallstrom <mattis@oliodevices.com>
- * based on Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com>
+ * based on leds-lm3530.c by Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com>
  * based on leds-lm3530.c by Dan Murphy <D.Murphy@motorola.com>
  */
 
@@ -526,6 +527,7 @@ static int lm3530_suspend(struct device *dev) {
  * lm3530_resume - reset backlight
  * 
  * Turn the backlight on again (Does android take care of this for us?)
+ * For now, leave this as a no-op - Android turns on the lights.
  */
 
 static int lm3530_resume(struct device *dev) {