Commit 16c75a13 authored by Johan Hovold's avatar Johan Hovold Committed by Tony Lindgren

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 741cac5f
...@@ -280,13 +280,14 @@ &mac { ...@@ -280,13 +280,14 @@ &mac {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&mmc1 { &mmc1 {
......
...@@ -614,12 +614,14 @@ &mac { ...@@ -614,12 +614,14 @@ &mac {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -495,12 +495,14 @@ &mac { ...@@ -495,12 +495,14 @@ &mac {
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
dual_emac = <1>; dual_emac = <1>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -95,6 +95,14 @@ leds_pins: pinmux_leds_pins { ...@@ -95,6 +95,14 @@ leds_pins: pinmux_leds_pins {
}; };
}; };
&mac {
status = "okay";
};
&davinci_mdio {
status = "okay";
};
&cpsw_emac0 { &cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>; phy_id = <&davinci_mdio>, <0>;
}; };
......
...@@ -344,6 +344,11 @@ partition@6 { ...@@ -344,6 +344,11 @@ partition@6 {
&mac { &mac {
dual_emac = <1>; dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {
......
...@@ -688,6 +688,7 @@ mac: ethernet@4a100000 { ...@@ -688,6 +688,7 @@ mac: ethernet@4a100000 {
*/ */
interrupts = <40 41 42 43>; interrupts = <40 41 42 43>;
ranges; ranges;
status = "disabled";
davinci_mdio: mdio@4a101000 { davinci_mdio: mdio@4a101000 {
compatible = "ti,davinci_mdio"; compatible = "ti,davinci_mdio";
...@@ -696,6 +697,7 @@ davinci_mdio: mdio@4a101000 { ...@@ -696,6 +697,7 @@ davinci_mdio: mdio@4a101000 {
ti,hwmods = "davinci_mdio"; ti,hwmods = "davinci_mdio";
bus_freq = <1000000>; bus_freq = <1000000>;
reg = <0x4a101000 0x100>; reg = <0x4a101000 0x100>;
status = "disabled";
}; };
cpsw_emac0: slave@4a100200 { cpsw_emac0: slave@4a100200 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment