diff options
author | Thierry Reding <treding@nvidia.com> | 2014-02-25 10:31:40 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2014-02-25 12:58:36 -0500 |
commit | e2b6d77ef8e6066e479fc4fcf9549f21b031f389 (patch) | |
tree | 5d14342f39de041c1421d71ab0c0c318299ba05c | |
parent | 11e5b4f9e33b0da8a5bf44c370688e37f5a4a72e (diff) |
ARM: tegra: Use "disabled" for status property
To disable a device tree node, the status property should be set to
"disabled", not "disable".
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra124.dtsi | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 389e987ec281..275cb184696a 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi | |||
@@ -600,7 +600,7 @@ | |||
600 | clocks = <&tegra_car TEGRA114_CLK_SDMMC1>; | 600 | clocks = <&tegra_car TEGRA114_CLK_SDMMC1>; |
601 | resets = <&tegra_car 14>; | 601 | resets = <&tegra_car 14>; |
602 | reset-names = "sdhci"; | 602 | reset-names = "sdhci"; |
603 | status = "disable"; | 603 | status = "disabled"; |
604 | }; | 604 | }; |
605 | 605 | ||
606 | sdhci@78000200 { | 606 | sdhci@78000200 { |
@@ -610,7 +610,7 @@ | |||
610 | clocks = <&tegra_car TEGRA114_CLK_SDMMC2>; | 610 | clocks = <&tegra_car TEGRA114_CLK_SDMMC2>; |
611 | resets = <&tegra_car 9>; | 611 | resets = <&tegra_car 9>; |
612 | reset-names = "sdhci"; | 612 | reset-names = "sdhci"; |
613 | status = "disable"; | 613 | status = "disabled"; |
614 | }; | 614 | }; |
615 | 615 | ||
616 | sdhci@78000400 { | 616 | sdhci@78000400 { |
@@ -620,7 +620,7 @@ | |||
620 | clocks = <&tegra_car TEGRA114_CLK_SDMMC3>; | 620 | clocks = <&tegra_car TEGRA114_CLK_SDMMC3>; |
621 | resets = <&tegra_car 69>; | 621 | resets = <&tegra_car 69>; |
622 | reset-names = "sdhci"; | 622 | reset-names = "sdhci"; |
623 | status = "disable"; | 623 | status = "disabled"; |
624 | }; | 624 | }; |
625 | 625 | ||
626 | sdhci@78000600 { | 626 | sdhci@78000600 { |
@@ -630,7 +630,7 @@ | |||
630 | clocks = <&tegra_car TEGRA114_CLK_SDMMC4>; | 630 | clocks = <&tegra_car TEGRA114_CLK_SDMMC4>; |
631 | resets = <&tegra_car 15>; | 631 | resets = <&tegra_car 15>; |
632 | reset-names = "sdhci"; | 632 | reset-names = "sdhci"; |
633 | status = "disable"; | 633 | status = "disabled"; |
634 | }; | 634 | }; |
635 | 635 | ||
636 | usb@7d000000 { | 636 | usb@7d000000 { |
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index ec0698a8354a..30a7377d5600 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi | |||
@@ -388,7 +388,7 @@ | |||
388 | clocks = <&tegra_car TEGRA124_CLK_SDMMC1>; | 388 | clocks = <&tegra_car TEGRA124_CLK_SDMMC1>; |
389 | resets = <&tegra_car 14>; | 389 | resets = <&tegra_car 14>; |
390 | reset-names = "sdhci"; | 390 | reset-names = "sdhci"; |
391 | status = "disable"; | 391 | status = "disabled"; |
392 | }; | 392 | }; |
393 | 393 | ||
394 | sdhci@700b0200 { | 394 | sdhci@700b0200 { |
@@ -398,7 +398,7 @@ | |||
398 | clocks = <&tegra_car TEGRA124_CLK_SDMMC2>; | 398 | clocks = <&tegra_car TEGRA124_CLK_SDMMC2>; |
399 | resets = <&tegra_car 9>; | 399 | resets = <&tegra_car 9>; |
400 | reset-names = "sdhci"; | 400 | reset-names = "sdhci"; |
401 | status = "disable"; | 401 | status = "disabled"; |
402 | }; | 402 | }; |
403 | 403 | ||
404 | sdhci@700b0400 { | 404 | sdhci@700b0400 { |
@@ -408,7 +408,7 @@ | |||
408 | clocks = <&tegra_car TEGRA124_CLK_SDMMC3>; | 408 | clocks = <&tegra_car TEGRA124_CLK_SDMMC3>; |
409 | resets = <&tegra_car 69>; | 409 | resets = <&tegra_car 69>; |
410 | reset-names = "sdhci"; | 410 | reset-names = "sdhci"; |
411 | status = "disable"; | 411 | status = "disabled"; |
412 | }; | 412 | }; |
413 | 413 | ||
414 | sdhci@700b0600 { | 414 | sdhci@700b0600 { |
@@ -418,7 +418,7 @@ | |||
418 | clocks = <&tegra_car TEGRA124_CLK_SDMMC4>; | 418 | clocks = <&tegra_car TEGRA124_CLK_SDMMC4>; |
419 | resets = <&tegra_car 15>; | 419 | resets = <&tegra_car 15>; |
420 | reset-names = "sdhci"; | 420 | reset-names = "sdhci"; |
421 | status = "disable"; | 421 | status = "disabled"; |
422 | }; | 422 | }; |
423 | 423 | ||
424 | ahub@70300000 { | 424 | ahub@70300000 { |