Device tree - adding file for H1, modifiying default omap3 tree files (so as not to interfere with our board file) and also adding an updated boardfile.

Change-Id: Ic9e859cddc4ff1b5a2e7101a76cf407e48164496

1 files changed, 123 insertions, 98 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 2b8802164c1..4a6b49b8e54 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -14,17 +14,18 @@
 	compatible = "ti,omap3430", "ti,omap3";
 	interrupt-parent = <&intc>;
 
-	aliases {
+	aliases { /*
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
+               */
 	};
 
-	cpus {
-		cpu@0 {
+	 cpus { 
+	 	cpu@0 {
 			compatible = "arm,cortex-a8";
-		};
-	};
+	 	};
+	 };
 
 	pmu {
 		compatible = "arm,cortex-a8-pmu";
@@ -43,14 +44,14 @@
 			ti,hwmods = "mpu";
 		};
 
-		iva {
-			compatible = "ti,iva2.2";
-			ti,hwmods = "iva";
-
-			dsp {
-				compatible = "ti,omap3-c64";
-			};
-		};
+	    iva {
+          compatible = "ti,iva2.2";
+          ti,hwmods = "iva";
+          
+          dsp {
+            compatible = "ti,omap3-c64";
+          };
+        }; 
 	};
 
 	/*
@@ -111,7 +112,7 @@
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0x7f1f>;
 			#gpio-range-cells = <3>;
-		};
+         };
 
 		gpio1: gpio@48310000 {
 			compatible = "ti,omap3-gpio";
@@ -123,24 +124,31 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-		};
+         };
 
-		gpio2: gpio@49050000 {
-			compatible = "ti,omap3-gpio";
-			reg = <0x49050000 0x200>;
-			interrupts = <30>;
-			ti,hwmods = "gpio2";
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			/* for gpio 32 33 there is no pnctrl controller defined */
-			gpio-ranges = <&omap3_pmx_core 2 0x25 10>,
-					<&omap3_pmx_core 12 0x37 8>,
-					<&omap3_pmx_core 20 0x40 8>,
-					<&omap3_pmx_core 28 0x4B 3>,
-					<&omap3_pmx_core 31 0x4f 1>;
-		};
+        /* disabling this one makes suspend work */
+        /* but it also causes the touch to NOT work */
+
+         gpio2: gpio@49050000 {
+		 	compatible = "ti,omap3-gpio";
+		 	reg = <0x49050000 0x200>;
+		 	interrupts = <30>;
+		 	ti,hwmods = "gpio2";
+		 	gpio-controller;
+            #gpio-cells = <2>;
+		 	interrupt-controller;
+             #interrupt-cells = <2>;
+		 	/* for gpio 32 33 there is no pnctrl controller defined */
+             /* gpio-ranges = <&omap3_pmx_core 2 0x25 10>, */
+             /*               <&omap3_pmx_core 12 0x37 8>, */
+             /*               <&omap3_pmx_core 20 0x40 8>, */
+		     /*               <&omap3_pmx_core 28 0x4B 3>, */
+             /*               <&omap3_pmx_core 31 0x4f 1>; */
+          };
+
+        /* Removing this one disables touch,
+         * suspend works.
+         */
 
 		gpio3: gpio@49052000 {
 			compatible = "ti,omap3-gpio";
@@ -151,26 +159,34 @@
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
-			gpio-ranges = <&omap3_pmx_core 0 0x50 32>;
-		};
+			/* gpio-ranges = <&omap3_pmx_core 0 0x50 32>; */
+         };
 
-		gpio4: gpio@49054000 {
-			compatible = "ti,omap3-gpio";
+        /* Removing this one disables _both_ touch 
+         * and suspend. 
+         */
+
+         gpio4: gpio@49054000 {
+            compatible = "ti,omap3-gpio";
 			reg = <0x49054000 0x200>;
 			interrupts = <32>;
 			ti,hwmods = "gpio4";
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-			#interrupt-cells = <2>;
+            #interrupt-cells = <2>;
 			/*
-			* gpio 127 in wkup mux, whcih we can not use (see
+			* gpio 127 in wkup mux, which we can not use (see
 			* sorce code for comment)
 			*/
-			gpio-ranges = <&omap3_pmx_core 0 0x70 16>,
-					<&omap3_pmx_core 16 0x82 14>,
-					<&omap3_pmx_core 30 0x81 1>;
-		};
+            /* gpio-ranges = <&omap3_pmx_core 0 0x70 16>,  */
+            /*               <&omap3_pmx_core 16 0x82 14>, */
+            /*               <&omap3_pmx_core 30 0x81 1>; */
+        };
+
+        /* Removing this one causes touch to work but suspend to 
+         * crash.... 
+         */
 
 		gpio5: gpio@49056000 {
 			compatible = "ti,omap3-gpio";
@@ -180,14 +196,18 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-			#interrupt-cells = <2>;
+            #interrupt-cells = <2>;
 			/*
-			* gpio 128 129 in wkup mux, whcih we can not use (see
-			* sorce code for comment)
-			*/
-			gpio-ranges = <&omap3_pmx_core 2 0x94 30>;
+             * gpio 128 129 in wkup mux, whcih we can not use (see
+             * sorce code for comment)
+             */
+            /* gpio-ranges = <&omap3_pmx_core 2 0x94 20>; */
 		};
 
+        /* Removing this one causes touch to work but suspend to 
+         * crash.... 
+         */       
+
 		gpio6: gpio@49058000 {
 			compatible = "ti,omap3-gpio";
 			reg = <0x49058000 0x200>;
@@ -196,18 +216,20 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
-			#interrupt-cells = <2>;
+            #interrupt-cells = <2>;
 			/* for gpio 187 there is no pnctrl controller defined */
-			gpio-ranges = <&omap3_pmx_core 0 0xb2 7>,
-					<&omap3_pmx_core 7 0x80 1>,
-					<&omap3_pmx_core 8 0xc7 1>,
-					<&omap3_pmx_core 9 0xc0 1>,
-					<&omap3_pmx_core 10 0xcb 13>,
-					<&omap3_pmx_core 23 0xc8 3>,
-					<&omap3_pmx_core 26 0xd9 1>,
-					<&omap3_pmx_core 28 0xc1 4>;
-		};
+            /* gpio-ranges = <&omap3_pmx_core 0 0xb2 7>, */
+            /*               <&omap3_pmx_core 7 0x80 1>, */
+            /*               <&omap3_pmx_core 8 0xc7 1>, */
+            /*               <&omap3_pmx_core 9 0xc0 1>, */
+            /*               <&omap3_pmx_core 10 0xcb 13>, */
+            /*               <&omap3_pmx_core 23 0xc8 3>, */
+            /*               <&omap3_pmx_core 26 0xd9 1>,  */
+            /*               <&omap3_pmx_core 28 0xc1 4>; */
+         };
+        
 
+        /*
 		uart1: serial@4806a000 {
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart1";
@@ -224,8 +246,9 @@
 			compatible = "ti,omap3-uart";
 			ti,hwmods = "uart3";
 			clock-frequency = <48000000>;
-		};
+         };*/
 
+        /*         
 		i2c1: i2c@48070000 {
 			compatible = "ti,omap3-i2c";
 			#address-cells = <1>;
@@ -245,7 +268,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			ti,hwmods = "i2c3";
-		};
+         }; */
 
 		mcspi1: spi@48098000 {
 			compatible = "ti,omap2-mcspi";
@@ -299,7 +322,7 @@
 			ti,spi-num-cs = <1>;
 			dmas = <&sdma 70>, <&sdma 71>;
 			dma-names = "tx0", "rx0";
-		};
+         };
 
 		mmc1: mmc@4809c000 {
 			compatible = "ti,omap3-hsmmc";
@@ -328,14 +351,15 @@
 			ti,hwmods = "wd_timer2";
 		};
 
+         
 		mcbsp1: mcbsp@48074000 {
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x48074000 0xff>;
-			reg-names = "mpu";
-			interrupts = <16>, /* OCP compliant interrupt */
-				     <59>, /* TX interrupt */
-				     <60>; /* RX interrupt */
-			interrupt-names = "common", "tx", "rx";
+            reg-names = "mpu";
+            interrupts = <16>, /* OCP compliant interrupt */
+                         <59>, /* TX interrupt */
+                         <60>; /* RX interrupt */
+            interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp1";
 			dmas = <&sdma 31>,
@@ -348,11 +372,11 @@
 			reg = <0x49022000 0xff>,
 			      <0x49028000 0xff>;
 			reg-names = "mpu", "sidetone";
-			interrupts = <17>, /* OCP compliant interrupt */
-				     <62>, /* TX interrupt */
-				     <63>, /* RX interrupt */
-				     <4>;  /* Sidetone */
-			interrupt-names = "common", "tx", "rx", "sidetone";
+            interrupts = <17>, /* OCP compliant interrupt */
+                         <62>, /* TX interrupt */
+                         <63>, /* RX interrupt */
+                         <4>;   /* Sidetone */
+            interrupt-names = "common", "tx", "rx", "sidetone";
 			ti,buffer-size = <1280>;
 			ti,hwmods = "mcbsp2", "mcbsp2_sidetone";
 			dmas = <&sdma 33>,
@@ -365,11 +389,11 @@
 			reg = <0x49024000 0xff>,
 			      <0x4902a000 0xff>;
 			reg-names = "mpu", "sidetone";
-			interrupts = <22>, /* OCP compliant interrupt */
-				     <89>, /* TX interrupt */
-				     <90>, /* RX interrupt */
-				     <5>;  /* Sidetone */
-			interrupt-names = "common", "tx", "rx", "sidetone";
+            interrupts = <22>, /* OCP compliant interrupt */
+                         <89>, /* TX interrupt */
+                         <90>, /* RX interrupt */
+                         <5>;   /* Sidetone */
+            interrupt-names = "common", "tx", "rx", "sidetone";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp3", "mcbsp3_sidetone";
 			dmas = <&sdma 17>,
@@ -381,10 +405,10 @@
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x49026000 0xff>;
 			reg-names = "mpu";
-			interrupts = <23>, /* OCP compliant interrupt */
-				     <54>, /* TX interrupt */
-				     <55>; /* RX interrupt */
-			interrupt-names = "common", "tx", "rx";
+            interrupts = <23>, /* OCP compliant interrupt */
+                         <54>, /* TX interrupt */
+                         <55>; /* RX interrupt */
+            interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp4";
 			dmas = <&sdma 19>,
@@ -396,16 +420,16 @@
 			compatible = "ti,omap3-mcbsp";
 			reg = <0x48096000 0xff>;
 			reg-names = "mpu";
-			interrupts = <27>, /* OCP compliant interrupt */
-				     <81>, /* TX interrupt */
-				     <82>; /* RX interrupt */
-			interrupt-names = "common", "tx", "rx";
+            interrupts = <27>, /* OCP compliant interrupt */
+                         <81>, /* TX interrupt */
+                         <82>; /* RX interrupt */
+            interrupt-names = "common", "tx", "rx";
 			ti,buffer-size = <128>;
 			ti,hwmods = "mcbsp5";
 			dmas = <&sdma 21>,
 			       <&sdma 22>;
 			dma-names = "tx", "rx";
-		};
+         };
 
 		timer1: timer@48318000 {
 			compatible = "ti,omap3430-timer";
@@ -501,13 +525,13 @@
 			ti,timer-alwon;
 			ti,timer-secure;
 		};
-
-		usbhstll: usbhstll@48062000 {
-			compatible = "ti,usbhs-tll";
-			reg = <0x48062000 0x1000>;
-			interrupts = <78>;
-			ti,hwmods = "usb_tll_hs";
-		};
+        
+        /* usbhstll: usbhstll@48062000 { */
+        /*     compatible = "ti,usbhs-tll"; */
+		/*  	reg = <0x48062000 0x1000>;  */
+		/*  	interrupts = <78>;  */
+		/*  	ti,hwmods = "usb_tll_hs"; */
+        /* }; */
 
 		usbhshost: usbhshost@48064000 {
 			compatible = "ti,usbhs-host";
@@ -517,12 +541,12 @@
 			#size-cells = <1>;
 			ranges;
 
-			usbhsohci: ohci@48064400 {
-				compatible = "ti,ohci-omap3", "usb-ohci";
-				reg = <0x48064400 0x400>;
-				interrupt-parent = <&intc>;
-				interrupts = <76>;
-			};
+			/* usbhsohci: ohci@48064400 { */
+			/* 	compatible = "ti,ohci-omap3", "usb-ohci"; */
+			/* 	reg = <0x48064400 0x400>; */
+			/* 	interrupt-parent = <&intc>; */
+			/* 	interrupts = <76>; */
+			/* }; */
 
 			usbhsehci: ehci@48064800 {
 				compatible = "ti,ehci-omap", "usb-ehci";
@@ -530,7 +554,7 @@
 				interrupt-parent = <&intc>;
 				interrupts = <77>;
 			};
-		};
+         };
 
 		gpmc: gpmc@6e000000 {
 			compatible = "ti,omap3430-gpmc";
@@ -543,6 +567,7 @@
 			#size-cells = <1>;
 		};
 
+        /*
 		usb_otg_hs: usb_otg_hs@480ab000 {
 			compatible = "ti,omap3-musb";
 			reg = <0x480ab000 0x1000>;
@@ -552,7 +577,7 @@
 			multipoint = <1>;
 			num-eps = <16>;
 			ram-bits = <12>;
-		};
+         };*/
 
 		glbl_prm: glbl_prm@48307250 {
 			/*