All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
@ 2012-06-11 15:11 ` Roland Stigge
  0 siblings, 0 replies; 8+ messages in thread
From: Roland Stigge @ 2012-06-11 15:11 UTC (permalink / raw)
  To: arm, linux-arm-kernel, linux-kernel, b-cousson, grant.likely,
	rob.herring
  Cc: Roland Stigge

This patches fixes some status = "disable" strings to "disabled", the correct
way of disabling nodes in the devicetree.

lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
changes there.

Signed-off-by: Roland Stigge <stigge@antcom.de>

---
Applies to v3.5-rc2

 arch/arm/boot/dts/omap3-beagle.dts |    4 +--
 arch/arm/boot/dts/omap4-panda.dts  |    6 ++---
 arch/arm/boot/dts/omap4-sdp.dts    |    4 +--
 arch/arm/boot/dts/tegra20.dtsi     |   36 +++++++++++++++++------------------
 arch/arm/boot/dts/tegra30.dtsi     |   38 ++++++++++++++++++-------------------
 5 files changed, 44 insertions(+), 44 deletions(-)

--- linux-2.6.orig/arch/arm/boot/dts/omap3-beagle.dts
+++ linux-2.6/arch/arm/boot/dts/omap3-beagle.dts
@@ -61,9 +61,9 @@
 };
 
 &mmc2 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
--- linux-2.6.orig/arch/arm/boot/dts/omap4-panda.dts
+++ linux-2.6/arch/arm/boot/dts/omap4-panda.dts
@@ -74,15 +74,15 @@
 };
 
 &mmc2 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc4 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc5 {
--- linux-2.6.orig/arch/arm/boot/dts/omap4-sdp.dts
+++ linux-2.6/arch/arm/boot/dts/omap4-sdp.dts
@@ -147,11 +147,11 @@
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc4 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc5 {
--- linux-2.6.orig/arch/arm/boot/dts/tegra20.dtsi
+++ linux-2.6/arch/arm/boot/dts/tegra20.dtsi
@@ -72,7 +72,7 @@
 		reg = <0x70002800 0x200>;
 		interrupts = <0 13 0x04>;
 		nvidia,dma-request-selector = <&apbdma 2>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	tegra_i2s2: i2s@70002a00 {
@@ -80,7 +80,7 @@
 		reg = <0x70002a00 0x200>;
 		interrupts = <0 3 0x04>;
 		nvidia,dma-request-selector = <&apbdma 1>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006000 {
@@ -88,7 +88,7 @@
 		reg = <0x70006000 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 36 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006040 {
@@ -96,7 +96,7 @@
 		reg = <0x70006040 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 37 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006200 {
@@ -104,7 +104,7 @@
 		reg = <0x70006200 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 46 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006300 {
@@ -112,7 +112,7 @@
 		reg = <0x70006300 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 90 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006400 {
@@ -120,7 +120,7 @@
 		reg = <0x70006400 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 91 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c000 {
@@ -129,7 +129,7 @@
 		interrupts = <0 38 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c400 {
@@ -138,7 +138,7 @@
 		interrupts = <0 84 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c500 {
@@ -147,7 +147,7 @@
 		interrupts = <0 92 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000d000 {
@@ -156,7 +156,7 @@
 		interrupts = <0 53 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmc {
@@ -190,7 +190,7 @@
 		interrupts = <0 20 0x04>;
 		phy_type = "utmi";
 		nvidia,has-legacy-mode;
-		status = "disable";
+		status = "disabled";
 	};
 
 	usb@c5004000 {
@@ -198,7 +198,7 @@
 		reg = <0xc5004000 0x4000>;
 		interrupts = <0 21 0x04>;
 		phy_type = "ulpi";
-		status = "disable";
+		status = "disabled";
 	};
 
 	usb@c5008000 {
@@ -206,35 +206,35 @@
 		reg = <0xc5008000 0x4000>;
 		interrupts = <0 97 0x04>;
 		phy_type = "utmi";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@c8000000 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000000 0x200>;
 		interrupts = <0 14 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@c8000200 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000200 0x200>;
 		interrupts = <0 15 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@c8000400 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000400 0x200>;
 		interrupts = <0 19 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@c8000600 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000600 0x200>;
 		interrupts = <0 31 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmu {
--- linux-2.6.orig/arch/arm/boot/dts/tegra30.dtsi
+++ linux-2.6/arch/arm/boot/dts/tegra30.dtsi
@@ -82,7 +82,7 @@
 		reg = <0x70006000 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 36 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006040 {
@@ -90,7 +90,7 @@
 		reg = <0x70006040 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 37 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006200 {
@@ -98,7 +98,7 @@
 		reg = <0x70006200 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 46 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006300 {
@@ -106,7 +106,7 @@
 		reg = <0x70006300 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 90 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial@70006400 {
@@ -114,7 +114,7 @@
 		reg = <0x70006400 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 91 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c000 {
@@ -123,7 +123,7 @@
 		interrupts = <0 38 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c400 {
@@ -132,7 +132,7 @@
 		interrupts = <0 84 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c500 {
@@ -141,7 +141,7 @@
 		interrupts = <0 92 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000c700 {
@@ -150,7 +150,7 @@
 		interrupts = <0 120 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c@7000d000 {
@@ -159,7 +159,7 @@
 		interrupts = <0 53 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmc {
@@ -201,35 +201,35 @@
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080300 0x100>;
 			nvidia,ahub-cif-ids = <4 4>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s1: i2s@70080400 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080400 0x100>;
 			nvidia,ahub-cif-ids = <5 5>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s2: i2s@70080500 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080500 0x100>;
 			nvidia,ahub-cif-ids = <6 6>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s3: i2s@70080600 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080600 0x100>;
 			nvidia,ahub-cif-ids = <7 7>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s4: i2s@70080700 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080700 0x100>;
 			nvidia,ahub-cif-ids = <8 8>;
-			status = "disable";
+			status = "disabled";
 		};
 	};
 
@@ -237,28 +237,28 @@
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <0 14 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000200 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <0 15 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000400 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <0 19 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000600 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <0 31 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmu {

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
@ 2012-06-11 15:11 ` Roland Stigge
  0 siblings, 0 replies; 8+ messages in thread
From: Roland Stigge @ 2012-06-11 15:11 UTC (permalink / raw)
  To: linux-arm-kernel

This patches fixes some status = "disable" strings to "disabled", the correct
way of disabling nodes in the devicetree.

lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
changes there.

Signed-off-by: Roland Stigge <stigge@antcom.de>

---
Applies to v3.5-rc2

 arch/arm/boot/dts/omap3-beagle.dts |    4 +--
 arch/arm/boot/dts/omap4-panda.dts  |    6 ++---
 arch/arm/boot/dts/omap4-sdp.dts    |    4 +--
 arch/arm/boot/dts/tegra20.dtsi     |   36 +++++++++++++++++------------------
 arch/arm/boot/dts/tegra30.dtsi     |   38 ++++++++++++++++++-------------------
 5 files changed, 44 insertions(+), 44 deletions(-)

--- linux-2.6.orig/arch/arm/boot/dts/omap3-beagle.dts
+++ linux-2.6/arch/arm/boot/dts/omap3-beagle.dts
@@ -61,9 +61,9 @@
 };
 
 &mmc2 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
--- linux-2.6.orig/arch/arm/boot/dts/omap4-panda.dts
+++ linux-2.6/arch/arm/boot/dts/omap4-panda.dts
@@ -74,15 +74,15 @@
 };
 
 &mmc2 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc4 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc5 {
--- linux-2.6.orig/arch/arm/boot/dts/omap4-sdp.dts
+++ linux-2.6/arch/arm/boot/dts/omap4-sdp.dts
@@ -147,11 +147,11 @@
 };
 
 &mmc3 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc4 {
-	status = "disable";
+	status = "disabled";
 };
 
 &mmc5 {
--- linux-2.6.orig/arch/arm/boot/dts/tegra20.dtsi
+++ linux-2.6/arch/arm/boot/dts/tegra20.dtsi
@@ -72,7 +72,7 @@
 		reg = <0x70002800 0x200>;
 		interrupts = <0 13 0x04>;
 		nvidia,dma-request-selector = <&apbdma 2>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	tegra_i2s2: i2s at 70002a00 {
@@ -80,7 +80,7 @@
 		reg = <0x70002a00 0x200>;
 		interrupts = <0 3 0x04>;
 		nvidia,dma-request-selector = <&apbdma 1>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006000 {
@@ -88,7 +88,7 @@
 		reg = <0x70006000 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 36 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006040 {
@@ -96,7 +96,7 @@
 		reg = <0x70006040 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 37 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006200 {
@@ -104,7 +104,7 @@
 		reg = <0x70006200 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 46 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006300 {
@@ -112,7 +112,7 @@
 		reg = <0x70006300 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 90 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006400 {
@@ -120,7 +120,7 @@
 		reg = <0x70006400 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 91 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c000 {
@@ -129,7 +129,7 @@
 		interrupts = <0 38 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c400 {
@@ -138,7 +138,7 @@
 		interrupts = <0 84 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c500 {
@@ -147,7 +147,7 @@
 		interrupts = <0 92 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000d000 {
@@ -156,7 +156,7 @@
 		interrupts = <0 53 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmc {
@@ -190,7 +190,7 @@
 		interrupts = <0 20 0x04>;
 		phy_type = "utmi";
 		nvidia,has-legacy-mode;
-		status = "disable";
+		status = "disabled";
 	};
 
 	usb at c5004000 {
@@ -198,7 +198,7 @@
 		reg = <0xc5004000 0x4000>;
 		interrupts = <0 21 0x04>;
 		phy_type = "ulpi";
-		status = "disable";
+		status = "disabled";
 	};
 
 	usb at c5008000 {
@@ -206,35 +206,35 @@
 		reg = <0xc5008000 0x4000>;
 		interrupts = <0 97 0x04>;
 		phy_type = "utmi";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at c8000000 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000000 0x200>;
 		interrupts = <0 14 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at c8000200 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000200 0x200>;
 		interrupts = <0 15 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at c8000400 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000400 0x200>;
 		interrupts = <0 19 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at c8000600 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000600 0x200>;
 		interrupts = <0 31 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmu {
--- linux-2.6.orig/arch/arm/boot/dts/tegra30.dtsi
+++ linux-2.6/arch/arm/boot/dts/tegra30.dtsi
@@ -82,7 +82,7 @@
 		reg = <0x70006000 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 36 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006040 {
@@ -90,7 +90,7 @@
 		reg = <0x70006040 0x40>;
 		reg-shift = <2>;
 		interrupts = <0 37 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006200 {
@@ -98,7 +98,7 @@
 		reg = <0x70006200 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 46 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006300 {
@@ -106,7 +106,7 @@
 		reg = <0x70006300 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 90 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	serial at 70006400 {
@@ -114,7 +114,7 @@
 		reg = <0x70006400 0x100>;
 		reg-shift = <2>;
 		interrupts = <0 91 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c000 {
@@ -123,7 +123,7 @@
 		interrupts = <0 38 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c400 {
@@ -132,7 +132,7 @@
 		interrupts = <0 84 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c500 {
@@ -141,7 +141,7 @@
 		interrupts = <0 92 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000c700 {
@@ -150,7 +150,7 @@
 		interrupts = <0 120 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	i2c at 7000d000 {
@@ -159,7 +159,7 @@
 		interrupts = <0 53 0x04>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmc {
@@ -201,35 +201,35 @@
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080300 0x100>;
 			nvidia,ahub-cif-ids = <4 4>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s1: i2s at 70080400 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080400 0x100>;
 			nvidia,ahub-cif-ids = <5 5>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s2: i2s at 70080500 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080500 0x100>;
 			nvidia,ahub-cif-ids = <6 6>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s3: i2s at 70080600 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080600 0x100>;
 			nvidia,ahub-cif-ids = <7 7>;
-			status = "disable";
+			status = "disabled";
 		};
 
 		tegra_i2s4: i2s at 70080700 {
 			compatible = "nvidia,tegra30-i2s";
 			reg = <0x70080700 0x100>;
 			nvidia,ahub-cif-ids = <8 8>;
-			status = "disable";
+			status = "disabled";
 		};
 	};
 
@@ -237,28 +237,28 @@
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <0 14 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at 78000200 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <0 15 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at 78000400 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <0 19 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci at 78000600 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <0 31 0x04>;
-		status = "disable";
+		status = "disabled";
 	};
 
 	pmu {

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
  2012-06-11 15:11 ` Roland Stigge
@ 2012-06-11 16:24   ` Rob Herring
  -1 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2012-06-11 16:24 UTC (permalink / raw)
  To: Roland Stigge
  Cc: arm, linux-arm-kernel, linux-kernel, b-cousson, grant.likely,
	rob.herring

On 06/11/2012 10:11 AM, Roland Stigge wrote:
> This patches fixes some status = "disable" strings to "disabled", the correct
> way of disabling nodes in the devicetree.
> 
> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
> changes there.
> 
> Signed-off-by: Roland Stigge <stigge@antcom.de>

Acked-by: Rob Herring <rob.herring@calxeda.com>

> 
> ---
> Applies to v3.5-rc2
> 
>  arch/arm/boot/dts/omap3-beagle.dts |    4 +--
>  arch/arm/boot/dts/omap4-panda.dts  |    6 ++---
>  arch/arm/boot/dts/omap4-sdp.dts    |    4 +--
>  arch/arm/boot/dts/tegra20.dtsi     |   36 +++++++++++++++++------------------
>  arch/arm/boot/dts/tegra30.dtsi     |   38 ++++++++++++++++++-------------------
>  5 files changed, 44 insertions(+), 44 deletions(-)
> 
> --- linux-2.6.orig/arch/arm/boot/dts/omap3-beagle.dts
> +++ linux-2.6/arch/arm/boot/dts/omap3-beagle.dts
> @@ -61,9 +61,9 @@
>  };
>  
>  &mmc2 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
> --- linux-2.6.orig/arch/arm/boot/dts/omap4-panda.dts
> +++ linux-2.6/arch/arm/boot/dts/omap4-panda.dts
> @@ -74,15 +74,15 @@
>  };
>  
>  &mmc2 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc4 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc5 {
> --- linux-2.6.orig/arch/arm/boot/dts/omap4-sdp.dts
> +++ linux-2.6/arch/arm/boot/dts/omap4-sdp.dts
> @@ -147,11 +147,11 @@
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc4 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc5 {
> --- linux-2.6.orig/arch/arm/boot/dts/tegra20.dtsi
> +++ linux-2.6/arch/arm/boot/dts/tegra20.dtsi
> @@ -72,7 +72,7 @@
>  		reg = <0x70002800 0x200>;
>  		interrupts = <0 13 0x04>;
>  		nvidia,dma-request-selector = <&apbdma 2>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	tegra_i2s2: i2s@70002a00 {
> @@ -80,7 +80,7 @@
>  		reg = <0x70002a00 0x200>;
>  		interrupts = <0 3 0x04>;
>  		nvidia,dma-request-selector = <&apbdma 1>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006000 {
> @@ -88,7 +88,7 @@
>  		reg = <0x70006000 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 36 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006040 {
> @@ -96,7 +96,7 @@
>  		reg = <0x70006040 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 37 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006200 {
> @@ -104,7 +104,7 @@
>  		reg = <0x70006200 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 46 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006300 {
> @@ -112,7 +112,7 @@
>  		reg = <0x70006300 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 90 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006400 {
> @@ -120,7 +120,7 @@
>  		reg = <0x70006400 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 91 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c000 {
> @@ -129,7 +129,7 @@
>  		interrupts = <0 38 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c400 {
> @@ -138,7 +138,7 @@
>  		interrupts = <0 84 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c500 {
> @@ -147,7 +147,7 @@
>  		interrupts = <0 92 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000d000 {
> @@ -156,7 +156,7 @@
>  		interrupts = <0 53 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmc {
> @@ -190,7 +190,7 @@
>  		interrupts = <0 20 0x04>;
>  		phy_type = "utmi";
>  		nvidia,has-legacy-mode;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	usb@c5004000 {
> @@ -198,7 +198,7 @@
>  		reg = <0xc5004000 0x4000>;
>  		interrupts = <0 21 0x04>;
>  		phy_type = "ulpi";
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	usb@c5008000 {
> @@ -206,35 +206,35 @@
>  		reg = <0xc5008000 0x4000>;
>  		interrupts = <0 97 0x04>;
>  		phy_type = "utmi";
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@c8000000 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000000 0x200>;
>  		interrupts = <0 14 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@c8000200 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000200 0x200>;
>  		interrupts = <0 15 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@c8000400 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000400 0x200>;
>  		interrupts = <0 19 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@c8000600 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000600 0x200>;
>  		interrupts = <0 31 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmu {
> --- linux-2.6.orig/arch/arm/boot/dts/tegra30.dtsi
> +++ linux-2.6/arch/arm/boot/dts/tegra30.dtsi
> @@ -82,7 +82,7 @@
>  		reg = <0x70006000 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 36 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006040 {
> @@ -90,7 +90,7 @@
>  		reg = <0x70006040 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 37 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006200 {
> @@ -98,7 +98,7 @@
>  		reg = <0x70006200 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 46 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006300 {
> @@ -106,7 +106,7 @@
>  		reg = <0x70006300 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 90 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial@70006400 {
> @@ -114,7 +114,7 @@
>  		reg = <0x70006400 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 91 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c000 {
> @@ -123,7 +123,7 @@
>  		interrupts = <0 38 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c400 {
> @@ -132,7 +132,7 @@
>  		interrupts = <0 84 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c500 {
> @@ -141,7 +141,7 @@
>  		interrupts = <0 92 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000c700 {
> @@ -150,7 +150,7 @@
>  		interrupts = <0 120 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c@7000d000 {
> @@ -159,7 +159,7 @@
>  		interrupts = <0 53 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmc {
> @@ -201,35 +201,35 @@
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080300 0x100>;
>  			nvidia,ahub-cif-ids = <4 4>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s1: i2s@70080400 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080400 0x100>;
>  			nvidia,ahub-cif-ids = <5 5>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s2: i2s@70080500 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080500 0x100>;
>  			nvidia,ahub-cif-ids = <6 6>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s3: i2s@70080600 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080600 0x100>;
>  			nvidia,ahub-cif-ids = <7 7>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s4: i2s@70080700 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080700 0x100>;
>  			nvidia,ahub-cif-ids = <8 8>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  	};
>  
> @@ -237,28 +237,28 @@
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000000 0x200>;
>  		interrupts = <0 14 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@78000200 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000200 0x200>;
>  		interrupts = <0 15 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@78000400 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000400 0x200>;
>  		interrupts = <0 19 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci@78000600 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000600 0x200>;
>  		interrupts = <0 31 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmu {
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
@ 2012-06-11 16:24   ` Rob Herring
  0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2012-06-11 16:24 UTC (permalink / raw)
  To: linux-arm-kernel

On 06/11/2012 10:11 AM, Roland Stigge wrote:
> This patches fixes some status = "disable" strings to "disabled", the correct
> way of disabling nodes in the devicetree.
> 
> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
> changes there.
> 
> Signed-off-by: Roland Stigge <stigge@antcom.de>

Acked-by: Rob Herring <rob.herring@calxeda.com>

> 
> ---
> Applies to v3.5-rc2
> 
>  arch/arm/boot/dts/omap3-beagle.dts |    4 +--
>  arch/arm/boot/dts/omap4-panda.dts  |    6 ++---
>  arch/arm/boot/dts/omap4-sdp.dts    |    4 +--
>  arch/arm/boot/dts/tegra20.dtsi     |   36 +++++++++++++++++------------------
>  arch/arm/boot/dts/tegra30.dtsi     |   38 ++++++++++++++++++-------------------
>  5 files changed, 44 insertions(+), 44 deletions(-)
> 
> --- linux-2.6.orig/arch/arm/boot/dts/omap3-beagle.dts
> +++ linux-2.6/arch/arm/boot/dts/omap3-beagle.dts
> @@ -61,9 +61,9 @@
>  };
>  
>  &mmc2 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
> --- linux-2.6.orig/arch/arm/boot/dts/omap4-panda.dts
> +++ linux-2.6/arch/arm/boot/dts/omap4-panda.dts
> @@ -74,15 +74,15 @@
>  };
>  
>  &mmc2 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc4 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc5 {
> --- linux-2.6.orig/arch/arm/boot/dts/omap4-sdp.dts
> +++ linux-2.6/arch/arm/boot/dts/omap4-sdp.dts
> @@ -147,11 +147,11 @@
>  };
>  
>  &mmc3 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc4 {
> -	status = "disable";
> +	status = "disabled";
>  };
>  
>  &mmc5 {
> --- linux-2.6.orig/arch/arm/boot/dts/tegra20.dtsi
> +++ linux-2.6/arch/arm/boot/dts/tegra20.dtsi
> @@ -72,7 +72,7 @@
>  		reg = <0x70002800 0x200>;
>  		interrupts = <0 13 0x04>;
>  		nvidia,dma-request-selector = <&apbdma 2>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	tegra_i2s2: i2s at 70002a00 {
> @@ -80,7 +80,7 @@
>  		reg = <0x70002a00 0x200>;
>  		interrupts = <0 3 0x04>;
>  		nvidia,dma-request-selector = <&apbdma 1>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006000 {
> @@ -88,7 +88,7 @@
>  		reg = <0x70006000 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 36 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006040 {
> @@ -96,7 +96,7 @@
>  		reg = <0x70006040 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 37 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006200 {
> @@ -104,7 +104,7 @@
>  		reg = <0x70006200 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 46 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006300 {
> @@ -112,7 +112,7 @@
>  		reg = <0x70006300 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 90 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006400 {
> @@ -120,7 +120,7 @@
>  		reg = <0x70006400 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 91 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c000 {
> @@ -129,7 +129,7 @@
>  		interrupts = <0 38 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c400 {
> @@ -138,7 +138,7 @@
>  		interrupts = <0 84 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c500 {
> @@ -147,7 +147,7 @@
>  		interrupts = <0 92 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000d000 {
> @@ -156,7 +156,7 @@
>  		interrupts = <0 53 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmc {
> @@ -190,7 +190,7 @@
>  		interrupts = <0 20 0x04>;
>  		phy_type = "utmi";
>  		nvidia,has-legacy-mode;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	usb at c5004000 {
> @@ -198,7 +198,7 @@
>  		reg = <0xc5004000 0x4000>;
>  		interrupts = <0 21 0x04>;
>  		phy_type = "ulpi";
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	usb at c5008000 {
> @@ -206,35 +206,35 @@
>  		reg = <0xc5008000 0x4000>;
>  		interrupts = <0 97 0x04>;
>  		phy_type = "utmi";
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at c8000000 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000000 0x200>;
>  		interrupts = <0 14 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at c8000200 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000200 0x200>;
>  		interrupts = <0 15 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at c8000400 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000400 0x200>;
>  		interrupts = <0 19 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at c8000600 {
>  		compatible = "nvidia,tegra20-sdhci";
>  		reg = <0xc8000600 0x200>;
>  		interrupts = <0 31 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmu {
> --- linux-2.6.orig/arch/arm/boot/dts/tegra30.dtsi
> +++ linux-2.6/arch/arm/boot/dts/tegra30.dtsi
> @@ -82,7 +82,7 @@
>  		reg = <0x70006000 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 36 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006040 {
> @@ -90,7 +90,7 @@
>  		reg = <0x70006040 0x40>;
>  		reg-shift = <2>;
>  		interrupts = <0 37 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006200 {
> @@ -98,7 +98,7 @@
>  		reg = <0x70006200 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 46 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006300 {
> @@ -106,7 +106,7 @@
>  		reg = <0x70006300 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 90 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	serial at 70006400 {
> @@ -114,7 +114,7 @@
>  		reg = <0x70006400 0x100>;
>  		reg-shift = <2>;
>  		interrupts = <0 91 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c000 {
> @@ -123,7 +123,7 @@
>  		interrupts = <0 38 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c400 {
> @@ -132,7 +132,7 @@
>  		interrupts = <0 84 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c500 {
> @@ -141,7 +141,7 @@
>  		interrupts = <0 92 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000c700 {
> @@ -150,7 +150,7 @@
>  		interrupts = <0 120 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	i2c at 7000d000 {
> @@ -159,7 +159,7 @@
>  		interrupts = <0 53 0x04>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmc {
> @@ -201,35 +201,35 @@
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080300 0x100>;
>  			nvidia,ahub-cif-ids = <4 4>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s1: i2s at 70080400 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080400 0x100>;
>  			nvidia,ahub-cif-ids = <5 5>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s2: i2s at 70080500 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080500 0x100>;
>  			nvidia,ahub-cif-ids = <6 6>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s3: i2s at 70080600 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080600 0x100>;
>  			nvidia,ahub-cif-ids = <7 7>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  
>  		tegra_i2s4: i2s at 70080700 {
>  			compatible = "nvidia,tegra30-i2s";
>  			reg = <0x70080700 0x100>;
>  			nvidia,ahub-cif-ids = <8 8>;
> -			status = "disable";
> +			status = "disabled";
>  		};
>  	};
>  
> @@ -237,28 +237,28 @@
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000000 0x200>;
>  		interrupts = <0 14 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at 78000200 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000200 0x200>;
>  		interrupts = <0 15 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at 78000400 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000400 0x200>;
>  		interrupts = <0 19 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	sdhci at 78000600 {
>  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
>  		reg = <0x78000600 0x200>;
>  		interrupts = <0 31 0x04>;
> -		status = "disable";
> +		status = "disabled";
>  	};
>  
>  	pmu {
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
  2012-06-11 15:11 ` Roland Stigge
@ 2012-06-11 17:30   ` Stephen Warren
  -1 siblings, 0 replies; 8+ messages in thread
From: Stephen Warren @ 2012-06-11 17:30 UTC (permalink / raw)
  To: Roland Stigge
  Cc: arm, linux-arm-kernel, linux-kernel, b-cousson, grant.likely,
	rob.herring

On 06/11/2012 09:11 AM, Roland Stigge wrote:
> This patches fixes some status = "disable" strings to "disabled", the correct
> way of disabling nodes in the devicetree.
> 
> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
> changes there.

The Tegra parts,
Acked-by: Stephen Warren <swarren@wwwdotorg.org>

Are you intending this to be applied for 3.5? If so, that's fine. If
not, splitting it up so I can take the Tegra parts through the Tegra
tree would reduce the possibility of conflicts.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
@ 2012-06-11 17:30   ` Stephen Warren
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Warren @ 2012-06-11 17:30 UTC (permalink / raw)
  To: linux-arm-kernel

On 06/11/2012 09:11 AM, Roland Stigge wrote:
> This patches fixes some status = "disable" strings to "disabled", the correct
> way of disabling nodes in the devicetree.
> 
> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
> changes there.

The Tegra parts,
Acked-by: Stephen Warren <swarren@wwwdotorg.org>

Are you intending this to be applied for 3.5? If so, that's fine. If
not, splitting it up so I can take the Tegra parts through the Tegra
tree would reduce the possibility of conflicts.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
  2012-06-11 17:30   ` Stephen Warren
@ 2012-06-11 19:02     ` Roland Stigge
  -1 siblings, 0 replies; 8+ messages in thread
From: Roland Stigge @ 2012-06-11 19:02 UTC (permalink / raw)
  To: Stephen Warren
  Cc: arm, linux-arm-kernel, linux-kernel, b-cousson, grant.likely,
	rob.herring

On 11/06/12 19:30, Stephen Warren wrote:
> On 06/11/2012 09:11 AM, Roland Stigge wrote:
>> This patches fixes some status = "disable" strings to "disabled", the correct
>> way of disabling nodes in the devicetree.
>>
>> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
>> changes there.
> 
> The Tegra parts,
> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
> 
> Are you intending this to be applied for 3.5? If so, that's fine. If
> not, splitting it up so I can take the Tegra parts through the Tegra
> tree would reduce the possibility of conflicts.

I would only put it into v3.6. Everything works fine without it (as Arnd
described), it just confused amateurs like me. :-)

Therefore, splitting it up.

Thanks,

Roland

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
@ 2012-06-11 19:02     ` Roland Stigge
  0 siblings, 0 replies; 8+ messages in thread
From: Roland Stigge @ 2012-06-11 19:02 UTC (permalink / raw)
  To: linux-arm-kernel

On 11/06/12 19:30, Stephen Warren wrote:
> On 06/11/2012 09:11 AM, Roland Stigge wrote:
>> This patches fixes some status = "disable" strings to "disabled", the correct
>> way of disabling nodes in the devicetree.
>>
>> lpc32xx.dtsi is fixed separately in the LPC32xx patch set due to the many
>> changes there.
> 
> The Tegra parts,
> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
> 
> Are you intending this to be applied for 3.5? If so, that's fine. If
> not, splitting it up so I can take the Tegra parts through the Tegra
> tree would reduce the possibility of conflicts.

I would only put it into v3.6. Everything works fine without it (as Arnd
described), it just confused amateurs like me. :-)

Therefore, splitting it up.

Thanks,

Roland

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-06-11 19:02 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-11 15:11 [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled" Roland Stigge
2012-06-11 15:11 ` Roland Stigge
2012-06-11 16:24 ` Rob Herring
2012-06-11 16:24   ` Rob Herring
2012-06-11 17:30 ` Stephen Warren
2012-06-11 17:30   ` Stephen Warren
2012-06-11 19:02   ` Roland Stigge
2012-06-11 19:02     ` Roland Stigge

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.