ARM: dts: AM33XX: fix ethernet and mdio default state

Make sure ethernet and mdio nodes are disabled by default and enable
them explicitly only on boards that actually use them.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index ded128340913e83944a8243ad753eeb6247b7840..bde1777b62bef8e76899473e8d935d45115e08e3 100644 (file)
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -280,13 +280,14 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
-
+       status = "okay";
 };
 
 &davinci_mdio {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
+       status = "okay";
 };
 
 &mmc1 {

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 6cb84f1be04aca9380b5a3087d3aae418f0356dc..ecb267767cf5c2ba9e7ef996f2843bb883bec942 100644 (file)
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -614,12 +614,14 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
+       status = "okay";
 };
 
 &davinci_mdio {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
+       status = "okay";
 };
 
 &cpsw_emac0 {

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 6f2e529bca25b7089445d317d43e645de61249ce..ab9a34ce524c8d2ac3e37c8a25785c78e0c73356 100644 (file)
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -495,12 +495,14 @@
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        dual_emac = <1>;
+       status = "okay";
 };
 
 &davinci_mdio {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
+       status = "okay";
 };
 
 &cpsw_emac0 {

diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 9c53b506c32799500bcc850b1f985c1b31210f8d..8a0a72dc7dd7243ca3f07b5bf9344760104af57a 100644 (file)
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -95,6 +95,14 @@
        };
 };
 
+&mac {
+       status = "okay";
+};
+
+&davinci_mdio {
+       status = "okay";
+};
+
 &cpsw_emac0 {
        phy_id = <&davinci_mdio>, <0>;
 };

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 9907b494b99cbf6e1277955c61a54bab726ae470..a3466455b17188eaafec7eab8b613550a264d3da 100644 (file)
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -344,6 +344,11 @@
 
 &mac {
        dual_emac = <1>;
+       status = "okay";
+};
+
+&davinci_mdio {
+       status = "okay";
 };
 
 &cpsw_emac0 {

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index cb6811e5ae5a9a148321d4e667dc34cde9bc9846..0fb5df4ad49872dcefc85be48054421b9778839d 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -688,6 +688,7 @@
                         */
                        interrupts = <40 41 42 43>;
                        ranges;
+                       status = "disabled";
 
                        davinci_mdio: mdio@4a101000 {
                                compatible = "ti,davinci_mdio";
@@ -696,6 +697,7 @@
                                ti,hwmods = "davinci_mdio";
                                bus_freq = <1000000>;
                                reg = <0x4a101000 0x100>;
+                               status = "disabled";
                        };
 
                        cpsw_emac0: slave@4a100200 {