---

yaml --- r: 281577 b: refs/heads/master c: 1fb3726 h: refs/heads/master i: 281575: 6fc688c v: v3
git-mirror · Dec 23, 2011 · 946b704 · 946b704
1 parent 7d57857
commit 946b704
Show file tree

Hide file tree

Showing 22 changed files with 110 additions and 612 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cad9a5ff61abeddc2acb22aace9245f39b98f72
+refs/heads/master: 1fb3726cf33a7402d797231fdba6ba49ed5eba75
diff --git a/trunk/Documentation/devicetree/bindings/arm/tegra.txt b/trunk/Documentation/devicetree/bindings/arm/tegra.txt
diff --git a/trunk/Documentation/devicetree/bindings/usb/tegra-usb.txt b/trunk/Documentation/devicetree/bindings/usb/tegra-usb.txt
diff --git a/trunk/arch/arm/boot/dts/tegra-harmony.dts b/trunk/arch/arm/boot/dts/tegra-harmony.dts
@@ -1,11 +1,16 @@
 /dts-v1/;
 
+/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
 	model = "NVIDIA Tegra2 Harmony evaluation board";
 	compatible = "nvidia,harmony", "nvidia,tegra20";
 
+	chosen {
+		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
+	};
+
 	memory@0 {
 		reg = < 0x00000000 0x40000000 >;
 	};
@@ -47,40 +52,16 @@
 		ext-mic-en-gpios = <&gpio 185 0>;
 	};
 
-	serial@70006000 {
-		status = "disable";
-	};
-
-	serial@70006040 {
-		status = "disable";
-	};
-
-	serial@70006200 {
-		status = "disable";
-	};
-
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
-	serial@70006400 {
-		status = "disable";
-	};
-
-	sdhci@c8000000 {
-		status = "disable";
-	};
-
 	sdhci@c8000200 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 155 0>; /* gpio PT3 */
 	};
 
-	sdhci@c8000400 {
-		status = "disable";
-	};
-
 	sdhci@c8000600 {
 		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

diff --git a/trunk/arch/arm/boot/dts/tegra-paz00.dts b/trunk/arch/arm/boot/dts/tegra-paz00.dts
diff --git a/trunk/arch/arm/boot/dts/tegra-seaboard.dts b/trunk/arch/arm/boot/dts/tegra-seaboard.dts
@@ -1,65 +1,25 @@
 /dts-v1/;
 
+/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
 	model = "NVIDIA Seaboard";
 	compatible = "nvidia,seaboard", "nvidia,tegra20";
 
+	chosen {
+		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
+	};
+
 	memory {
 		device_type = "memory";
 		reg = < 0x00000000 0x40000000 >;
 	};
 
-	i2c@7000c000 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000c400 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000c500 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000d000 {
-		clock-frequency = <400000>;
-
-		adt7461@4c {
-			compatible = "adt7461";
-			reg = <0x4c>;
-		};
-	};
-
-	serial@70006000 {
-		status = "disable";
-	};
-
-	serial@70006040 {
-		status = "disable";
-	};
-
-	serial@70006200 {
-		status = "disable";
-	};
-
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
-	serial@70006400 {
-		status = "disable";
-	};
-
-	sdhci@c8000000 {
-		status = "disable";
-	};
-
-	sdhci@c8000200 {
-		status = "disable";
-	};
-
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
@@ -69,28 +29,4 @@
 	sdhci@c8000600 {
 		support-8bit;
 	};
-
-	usb@c5000000 {
-		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-
-		power {
-			label = "Power";
-			gpios = <&gpio 170 1>; /* gpio PV2, active low */
-			linux,code = <116>; /* KEY_POWER */
-			gpio-key,wakeup;
-		};
-
-		lid {
-			label = "Lid";
-			gpios = <&gpio 23 0>; /* gpio PC7 */
-			linux,input-type = <5>; /* EV_SW */
-			linux,code = <0>; /* SW_LID */
-			debounce-interval = <1>;
-			gpio-key,wakeup;
-		};
-	};
 };
diff --git a/trunk/arch/arm/boot/dts/tegra-trimslice.dts b/trunk/arch/arm/boot/dts/tegra-trimslice.dts
diff --git a/trunk/arch/arm/boot/dts/tegra-ventana.dts b/trunk/arch/arm/boot/dts/tegra-ventana.dts
@@ -1,59 +1,24 @@
 /dts-v1/;
 
+/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
 	model = "NVIDIA Tegra2 Ventana evaluation board";
 	compatible = "nvidia,ventana", "nvidia,tegra20";
 
-	memory {
-		reg = < 0x00000000 0x40000000 >;
-	};
-
-	i2c@7000c000 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000c400 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000c500 {
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000d000 {
-		clock-frequency = <400000>;
-	};
-
-	serial@70006000 {
-		status = "disable";
-	};
-
-	serial@70006040 {
-		status = "disable";
+	chosen {
+		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
 	};
 
-	serial@70006200 {
-		status = "disable";
+	memory {
+		reg = < 0x00000000 0x40000000 >;
 	};
 
 	serial@70006300 {
 		clock-frequency = < 216000000 >;
 	};
 
-	serial@70006400 {
-		status = "disable";
-	};
-
-	sdhci@c8000000 {
-		status = "disable";
-	};
-
-	sdhci@c8000200 {
-		status = "disable";
-	};
-
 	sdhci@c8000400 {
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */