Skip to contentSkip to conversation

ARM: tegra: Use "disabled" for status property

PATCH Applied Thierry Reding 2 participants 2 messages Feb 25, 2014 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: tegra: Use "disabled" for status property

From: Thierry Reding <[email protected]>

To disable a device tree node, the status property should be set to "disabled", not "disable".

---
 arch/arm/boot/dts/tegra114.dtsi | 8 ++++----
 arch/arm/boot/dts/tegra124.dtsi | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +4 -4
index 44ec401ec366..fdc559ab2db3 100644
@@ -604,7 +604,7 @@
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000200 {
@@ -614,7 +614,7 @@
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000400 {
@@ -624,7 +624,7 @@
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@78000600 {
@@ -634,7 +634,7 @@
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	usb@7d000000 {
arch/arm/boot/dts/tegra124.dtsi +4 -4
index ec0698a8354a..30a7377d5600 100644
@@ -388,7 +388,7 @@
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC1>;
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@700b0200 {
@@ -398,7 +398,7 @@
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC2>;
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@700b0400 {
@@ -408,7 +408,7 @@
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC3>;
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	sdhci@700b0600 {
@@ -418,7 +418,7 @@
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC4>;
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
-		status = "disable";
+		status = "disabled";
 	};
 
 	ahub@70300000 {
Signature · 1 line
1.8.4.2

A message that is not in the archive (sent off-list or not yet received): 1393342300-9477-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw
Quoted 4 lines · Thierry Reding

From: Thierry Reding <[email protected]>

To disable a device tree node, the status property should be set to "disabled", not "disable".

I have applied this to Tegra's for-3.15/dt branch.

I could see an argument for applying this to stable, but since this causes no user-visible issue, and isn't a regression, I decided against it.