Skip to contentSkip to conversation

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

PATCH In review Johan Hovold 3 participants 3 messages May 8, 2014 – May 14, 2014 Device tree bindings

lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/boot/dts/am335x-bone-common.dtsi | 3 ++-
 arch/arm/boot/dts/am335x-evm.dts          | 2 ++
 arch/arm/boot/dts/am335x-evmsk.dts        | 2 ++
 arch/arm/boot/dts/am335x-igep0033.dtsi    | 8 ++++++++
 arch/arm/boot/dts/am335x-nano.dts         | 5 +++++
 arch/arm/boot/dts/am33xx.dtsi             | 2 ++
 6 files changed, 21 insertions(+), 1 deletion(-)
arch/arm/boot/dts/am335x-bone-common.dtsi +2 -1
index 2e7d932887b5..26a1fa958f37 100644
@@ -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 {
arch/arm/boot/dts/am335x-evm.dts +2 -0
index 6028217ace0f..44c63d1c4f12 100644
@@ -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 {
arch/arm/boot/dts/am335x-evmsk.dts +2 -0
index ab238850a7b2..365383f7f617 100644
@@ -484,12 +484,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 {
arch/arm/boot/dts/am335x-igep0033.dtsi +8 -0
index 9f22c189f636..27445d07f953 100644
@@ -95,6 +95,14 @@
 	};
 };
 
+&mac {
+	status = "okay";
+};
+
+&davinci_mdio {
+	status = "okay";
+};
+
 &cpsw_emac0 {
 	phy_id = <&davinci_mdio>, <0>;
 };
arch/arm/boot/dts/am335x-nano.dts +5 -0
index 9907b494b99c..a3466455b171 100644
@@ -344,6 +344,11 @@
 
 &mac {
 	dual_emac = <1>;
+	status = "okay";
+};
+
+&davinci_mdio {
+	status = "okay";
 };
 
 &cpsw_emac0 {
arch/arm/boot/dts/am33xx.dtsi +2 -0
index cb6811e5ae5a..0fb5df4ad498 100644
@@ -688,6 +688,7 @@
 			 */
 			interrupts = <40 41 42 43>;
 			ranges;
+			status = "disabled";
 
 			davinci_mdio: mdio at 4a101000 {
 				compatible = "ti,davinci_mdio";

@@ -696,6 +697,7 @@
 				ti,hwmods = "davinci_mdio";
 				bus_freq = <1000000>;
 				reg = <0x4a101000 0x100>;
+				status = "disabled";
 			};
 
 			cpsw_emac0: slave at 4a100200 {
Signature · 1 line
1.8.3.2
#2 lore raw
In reply to Johan Hovold
Quoted 2 lines · Johan Hovold

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

Thanks applying into omap-for-v3.16/dt.

Tony