| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 11 Jun 2012 11:24:50 -0500
From: Rob Herring <robherring2@...il.com>
To: Roland Stigge <stigge@...com.de>
CC: arm@...nel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, b-cousson@...com,
grant.likely@...retlab.ca, rob.herring@...xeda.com
Subject: Re: [PATCH] ARM: Fix dts files w/ status property: "disable" -> "disabled"
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@...com.de>
Acked-by: Rob Herring <rob.herring@...xeda.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@...02a00 {
> @@ -80,7 +80,7 @@
> reg = <0x70002a00 0x200>;
> interrupts = <0 3 0x04>;
> nvidia,dma-request-selector = <&apbdma 1>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06000 {
> @@ -88,7 +88,7 @@
> reg = <0x70006000 0x40>;
> reg-shift = <2>;
> interrupts = <0 36 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06040 {
> @@ -96,7 +96,7 @@
> reg = <0x70006040 0x40>;
> reg-shift = <2>;
> interrupts = <0 37 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06200 {
> @@ -104,7 +104,7 @@
> reg = <0x70006200 0x100>;
> reg-shift = <2>;
> interrupts = <0 46 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06300 {
> @@ -112,7 +112,7 @@
> reg = <0x70006300 0x100>;
> reg-shift = <2>;
> interrupts = <0 90 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06400 {
> @@ -120,7 +120,7 @@
> reg = <0x70006400 0x100>;
> reg-shift = <2>;
> interrupts = <0 91 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c000 {
> @@ -129,7 +129,7 @@
> interrupts = <0 38 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c400 {
> @@ -138,7 +138,7 @@
> interrupts = <0 84 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c500 {
> @@ -147,7 +147,7 @@
> interrupts = <0 92 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0d000 {
> @@ -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@...04000 {
> @@ -198,7 +198,7 @@
> reg = <0xc5004000 0x4000>;
> interrupts = <0 21 0x04>;
> phy_type = "ulpi";
> - status = "disable";
> + status = "disabled";
> };
>
> usb@...08000 {
> @@ -206,35 +206,35 @@
> reg = <0xc5008000 0x4000>;
> interrupts = <0 97 0x04>;
> phy_type = "utmi";
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00000 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000000 0x200>;
> interrupts = <0 14 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00200 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000200 0x200>;
> interrupts = <0 15 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00400 {
> compatible = "nvidia,tegra20-sdhci";
> reg = <0xc8000400 0x200>;
> interrupts = <0 19 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00600 {
> 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@...06040 {
> @@ -90,7 +90,7 @@
> reg = <0x70006040 0x40>;
> reg-shift = <2>;
> interrupts = <0 37 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06200 {
> @@ -98,7 +98,7 @@
> reg = <0x70006200 0x100>;
> reg-shift = <2>;
> interrupts = <0 46 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06300 {
> @@ -106,7 +106,7 @@
> reg = <0x70006300 0x100>;
> reg-shift = <2>;
> interrupts = <0 90 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> serial@...06400 {
> @@ -114,7 +114,7 @@
> reg = <0x70006400 0x100>;
> reg-shift = <2>;
> interrupts = <0 91 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c000 {
> @@ -123,7 +123,7 @@
> interrupts = <0 38 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c400 {
> @@ -132,7 +132,7 @@
> interrupts = <0 84 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c500 {
> @@ -141,7 +141,7 @@
> interrupts = <0 92 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0c700 {
> @@ -150,7 +150,7 @@
> interrupts = <0 120 0x04>;
> #address-cells = <1>;
> #size-cells = <0>;
> - status = "disable";
> + status = "disabled";
> };
>
> i2c@...0d000 {
> @@ -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@...80400 {
> compatible = "nvidia,tegra30-i2s";
> reg = <0x70080400 0x100>;
> nvidia,ahub-cif-ids = <5 5>;
> - status = "disable";
> + status = "disabled";
> };
>
> tegra_i2s2: i2s@...80500 {
> compatible = "nvidia,tegra30-i2s";
> reg = <0x70080500 0x100>;
> nvidia,ahub-cif-ids = <6 6>;
> - status = "disable";
> + status = "disabled";
> };
>
> tegra_i2s3: i2s@...80600 {
> compatible = "nvidia,tegra30-i2s";
> reg = <0x70080600 0x100>;
> nvidia,ahub-cif-ids = <7 7>;
> - status = "disable";
> + status = "disabled";
> };
>
> tegra_i2s4: i2s@...80700 {
> 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@...00200 {
> compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
> reg = <0x78000200 0x200>;
> interrupts = <0 15 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00400 {
> compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
> reg = <0x78000400 0x200>;
> interrupts = <0 19 0x04>;
> - status = "disable";
> + status = "disabled";
> };
>
> sdhci@...00600 {
> 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@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists