---

yaml --- r: 308379 b: refs/heads/master c: 2eaab06 h: refs/heads/master i: 308377: 72cc2ca 308375: 72f1aca v: v3
git-mirror · May 14, 2012 · ff8de53 · ff8de53
1 parent 43ce250
commit ff8de53
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c04abb3a07b56db4756b6f970609e65a8624b0a3
+refs/heads/master: 2eaab06ea6cc2d686fd1a6de62b1094bedc4cfca
diff --git a/trunk/arch/arm/boot/dts/tegra-paz00.dts b/trunk/arch/arm/boot/dts/tegra-paz00.dts
@@ -270,11 +270,11 @@
 	};
 
 	nvec {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,nvec";
 		reg = <0x7000c500 0x100>;
 		interrupts = <0 92 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 		clock-frequency = <80000>;
 		request-gpios = <&gpio 170 0>; /* gpio PV2 */
 		slave-addr = <138>;

diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi
@@ -6,10 +6,10 @@
 
 	intc: interrupt-controller {
 		compatible = "arm,cortex-a9-gic";
-		interrupt-controller;
-		#interrupt-cells = <3>;
 		reg = <0x50041000 0x1000
 		       0x50040100 0x0100>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
 	};
 
 	apbdma: dma {
@@ -117,35 +117,35 @@
 	};
 
 	i2c@7000c000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra20-i2c";
 		reg = <0x7000c000 0x100>;
 		interrupts = <0 38 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000c400 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra20-i2c";
 		reg = <0x7000c400 0x100>;
 		interrupts = <0 84 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000c500 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra20-i2c";
 		reg = <0x7000c500 0x100>;
 		interrupts = <0 92 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000d000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra20-i2c-dvc";
 		reg = <0x7000d000 0x200>;
 		interrupts = <0 53 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	pmc {
@@ -167,10 +167,10 @@
 	};
 
 	emc {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra20-emc";
 		reg = <0x7000f400 0x200>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	usb@c5000000 {

diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi
@@ -6,10 +6,10 @@
 
 	intc: interrupt-controller {
 		compatible = "arm,cortex-a9-gic";
-		interrupt-controller;
-		#interrupt-cells = <3>;
 		reg = <0x50041000 0x1000
 		       0x50040100 0x0100>;
+		interrupt-controller;
+		#interrupt-cells = <3>;
 	};
 
 	apbdma: dma {
@@ -113,43 +113,43 @@
 	};
 
 	i2c@7000c000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000c000 0x100>;
 		interrupts = <0 38 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000c400 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000c400 0x100>;
 		interrupts = <0 84 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000c500 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000c500 0x100>;
 		interrupts = <0 92 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000c700 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000c700 0x100>;
 		interrupts = <0 120 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	i2c@7000d000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
 		compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000d000 0x100>;
 		interrupts = <0 53 0x04>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	pmc {