---

yaml --- r: 308380 b: refs/heads/master c: 2a5fdc9 h: refs/heads/master v: v3
git-mirror · May 14, 2012 · 21d05ef · 21d05ef
1 parent ff8de53
commit 21d05ef
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 161 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2eaab06ea6cc2d686fd1a6de62b1094bedc4cfca
+refs/heads/master: 2a5fdc9adde8476751b63a795e3d66ae2ee3979d
diff --git a/trunk/arch/arm/boot/dts/tegra-cardhu.dts b/trunk/arch/arm/boot/dts/tegra-cardhu.dts
@@ -64,34 +64,22 @@
 	};
 
 	serial@70006000 {
+		status = "okay";
 		clock-frequency = <408000000>;
 	};
 
-	serial@70006040 {
-		status = "disable";
-	};
-
-	serial@70006200 {
-		status = "disable";
-	};
-
-	serial@70006300 {
-		status = "disable";
-	};
-
-	serial@70006400 {
-		status = "disable";
-	};
-
 	i2c@7000c000 {
+		status = "okay";
 		clock-frequency = <100000>;
 	};
 
 	i2c@7000c400 {
+		status = "okay";
 		clock-frequency = <100000>;
 	};
 
 	i2c@7000c500 {
+		status = "okay";
 		clock-frequency = <100000>;
 
 		/* ALS and Proximity sensor */
@@ -104,10 +92,12 @@
 	};
 
 	i2c@7000c700 {
+		status = "okay";
 		clock-frequency = <100000>;
 	};
 
 	i2c@7000d000 {
+		status = "okay";
 		clock-frequency = <100000>;
 
 		wm8903: wm8903@1a {
@@ -139,38 +129,20 @@
 	};
 
 	ahub {
-		i2s@70080300 {
-			status = "disable";
-		};
-
-		i2s@70080500 {
-			status = "disable";
-		};
-
-		i2s@70080600 {
-			status = "disable";
-		};
-
-		i2s@70080700 {
-			status = "disable";
+		i2s@70080400 {
+			status = "okay";
 		};
 	};
 
 	sdhci@78000000 {
+		status = "okay";
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 155 0>; /* gpio PT3 */
 		power-gpios = <&gpio 31 0>; /* gpio PD7 */
 	};
 
-	sdhci@78000200 {
-		status = "disable";
-	};
-
-	sdhci@78000400 {
-		status = "disable";
-	};
-
 	sdhci@78000600 {
+		status = "okay";
 		support-8bit;
 	};
 

diff --git a/trunk/arch/arm/boot/dts/tegra-harmony.dts b/trunk/arch/arm/boot/dts/tegra-harmony.dts
@@ -234,31 +234,17 @@
 		};
 	};
 
-	i2s@70002a00 {
-		status = "disable";
-	};
-
-	serial@70006000 {
-		status = "disable";
-	};
-
-	serial@70006040 {
-		status = "disable";
-	};
-
-	serial@70006200 {
-		status = "disable";
+	i2s@70002800 {
+		status = "okay";
 	};
 
 	serial@70006300 {
+		status = "okay";
 		clock-frequency = <216000000>;
 	};
 
-	serial@70006400 {
-		status = "disable";
-	};
-
 	i2c@7000c000 {
+		status = "okay";
 		clock-frequency = <400000>;
 
 		wm8903: wm8903@1a {
@@ -277,40 +263,46 @@
 	};
 
 	i2c@7000c400 {
+		status = "okay";
 		clock-frequency = <400000>;
 	};
 
 	i2c@7000c500 {
+		status = "okay";
 		clock-frequency = <400000>;
 	};
 
 	i2c@7000d000 {
+		status = "okay";
 		clock-frequency = <400000>;
 	};
 
 	pmc {
 		nvidia,invert-interrupt;
 	};
 
+	usb@c5000000 {
+		status = "okay";
+	};
+
 	usb@c5004000 {
+		status = "okay";
 		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 	};
 
-	sdhci@c8000000 {
-		status = "disable";
+	usb@c5008000 {
+		status = "okay";
 	};
 
 	sdhci@c8000200 {
+		status = "okay";
 		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 {
+		status = "okay";
 		cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */

diff --git a/trunk/arch/arm/boot/dts/tegra-paz00.dts b/trunk/arch/arm/boot/dts/tegra-paz00.dts
@@ -226,31 +226,22 @@
 		};
 	};
 
-	i2s@70002a00 {
-		status = "disable";
+	i2s@70002800 {
+		status = "okay";
 	};
 
 	serial@70006000 {
+		status = "okay";
 		clock-frequency = <216000000>;
 	};
 
-	serial@70006040 {
-		status = "disable";
-	};
-
 	serial@70006200 {
+		status = "okay";
 		clock-frequency = <216000000>;
 	};
 
-	serial@70006300 {
-		status = "disable";
-	};
-
-	serial@70006400 {
-		status = "disable";
-	};
-
 	i2c@7000c000 {
+		status = "okay";
 		clock-frequency = <400000>;
 
 		alc5632: alc5632@1e {
@@ -262,13 +253,10 @@
 	};
 
 	i2c@7000c400 {
+		status = "okay";
 		clock-frequency = <400000>;
 	};
 
-	i2c@7000c500 {
-		status = "disable";
-	};
-
 	nvec {
 		compatible = "nvidia,nvec";
 		reg = <0x7000c500 0x100>;
@@ -281,6 +269,7 @@
 	};
 
 	i2c@7000d000 {
+		status = "okay";
 		clock-frequency = <400000>;
 
 		adt7461@4c {
@@ -289,25 +278,28 @@
 		};
 	};
 
+	usb@c5000000 {
+		status = "okay";
+	};
+
 	usb@c5004000 {
+		status = "okay";
 		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
 	};
 
+	usb@c5008000 {
+		status = "okay";
+	};
+
 	sdhci@c8000000 {
+		status = "okay";
 		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
 		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
 		power-gpios = <&gpio 169 0>; /* gpio PV1 */
 	};
 
-	sdhci@c8000200 {
-		status = "disable";
-	};
-
-	sdhci@c8000400 {
-		status = "disable";
-	};
-
 	sdhci@c8000600 {
+		status = "okay";
 		support-8bit;
 	};
 

diff --git a/trunk/arch/arm/boot/dts/tegra-seaboard.dts b/trunk/arch/arm/boot/dts/tegra-seaboard.dts
@@ -257,31 +257,17 @@
 		};
 	};
 
-	i2s@70002a00 {
-		status = "disable";
-	};
-
-	serial@70006000 {
-		status = "disable";
-	};
-
-	serial@70006040 {
-		status = "disable";
-	};
-
-	serial@70006200 {
-		status = "disable";
+	i2s@70002800 {
+		status = "okay";
 	};
 
 	serial@70006300 {
+		status = "okay";
 		clock-frequency = <216000000>;
 	};
 
-	serial@70006400 {
-		status = "disable";
-	};
-
 	i2c@7000c000 {
+		status = "okay";
 		clock-frequency = <400000>;
 
 		wm8903: wm8903@1a {
@@ -315,6 +301,7 @@
 	};
 
 	i2c@7000c400 {
+		status = "okay";
 		clock-frequency = <100000>;
 
 		smart-battery@b {
@@ -326,10 +313,12 @@
 	};
 
 	i2c@7000c500 {
+		status = "okay";
 		clock-frequency = <400000>;
 	};
 
 	i2c@7000d000 {
+		status = "okay";
 		clock-frequency = <400000>;
 
 		temperature-sensor@4c {
@@ -384,29 +373,29 @@
 	};
 
 	usb@c5000000 {
+		status = "okay";
 		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
 		dr_mode = "otg";
 	};
 
 	usb@c5004000 {
+		status = "okay";
 		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 	};
 
-	sdhci@c8000000 {
-		status = "disable";
-	};
-
-	sdhci@c8000200 {
-		status = "disable";
+	usb@c5008000 {
+		status = "okay";
 	};
 
 	sdhci@c8000400 {
+		status = "okay";
 		cd-gpios = <&gpio 69 0>; /* gpio PI5 */
 		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
 		power-gpios = <&gpio 70 0>; /* gpio PI6 */
 	};
 
 	sdhci@c8000600 {
+		status = "okay";
 		support-8bit;
 	};