arm64: dts: ti: k3-{am62p,j722s}: Disable ethernet by default
Subsystems (2)
PATCH v2 1/1 arm64: dts: ti: k3-{am62p,j722s}: Disable ethernet by default
Device tree best practice is to disable any external interface in the dtsi and just enable them if needed in the device tree. Thus, disable the ethernet switch and its ports by default and just enable the ones used by the EVMs in their device trees.
There is no functional change.
---
v2:
- move the status propert into k3-am62p5-main.dtsi, thus also update the k3-am62p5-sk.dts
- put "status" last
--- arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 3 +++ arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 3 +++ arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 5 +---- 3 files changed, 7 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-am62p-main.dtsi +3 -0
@@ -673,6 +673,7 @@ cpsw3g: ethernet@8000000 { assigned-clock-parents = <&k3_clks 13 11>; clock-names = "fck"; power-domains = <&k3_pds 13 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; dmas = <&main_pktdma 0xc600 15>, <&main_pktdma 0xc601 15>,
@@ -696,6 +697,7 @@ cpsw_port1: port@1 { label = "port1"; phys = <&phy_gmii_sel 1>; mac-address = [00 00 00 00 00 00]; + status = "disabled"; }; cpsw_port2: port@2 {
@@ -704,6 +706,7 @@ cpsw_port2: port@2 { label = "port2"; phys = <&phy_gmii_sel 2>; mac-address = [00 00 00 00 00 00]; + status = "disabled"; }; };
arch/arm64/boot/dts/ti/k3-am62p5-sk.dts +3 -0
@@ -431,16 +431,19 @@ &cpsw3g { pinctrl-names = "default"; pinctrl-0 = <&main_rgmii1_pins_default>, <&main_rgmii2_pins_default>; + status = "okay"; }; &cpsw_port1 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy0>; + status = "okay"; }; &cpsw_port2 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy1>; + status = "okay"; }; &cpsw3g_mdio {
arch/arm64/boot/dts/ti/k3-j722s-evm.dts +1 -4
@@ -226,10 +226,7 @@ cpsw3g_phy0: ethernet-phy@0 { &cpsw_port1 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy0>; -}; - -&cpsw_port2 { - status = "disabled"; + status = "okay"; }; &main_gpio1 {
Signature · 1 line
2.39.2
Quoted 9 lines · Michael Walle
Device tree best practice is to disable any external interface in the dtsi and just enable them if needed in the device tree. Thus, disable the ethernet switch and its ports by default and just enable the ones used by the EVMs in their device trees.
There is no functional change.
Signed-off-by Michael Walle <[email protected]>---
Quoted 78 lines
v2:
- move the status propert intok3-am62p5-main.dtsi, thus also updatethe k3-am62p5-sk.dts - put "status" last --- arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 3 +++ arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 3 +++ arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 5 +---- 3 files changed, 7 insertions(+), 4 deletions(-)arch/arm64/boot/dts/ti/k3-am62p-main.dtsi +3
-0@@ -673,6 +673,7 @@ cpsw3g: ethernet@8000000 { assigned-clock-parents = <&k3_clks 13 11>; clock-names = "fck"; power-domains = <&k3_pds 13 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; dmas = <&main_pktdma 0xc600 15>, <&main_pktdma 0xc601 15>,@@ -696,6 +697,7 @@ cpsw_port1: port@1 { label = "port1"; phys = <&phy_gmii_sel 1>; mac-address = [00 00 00 00 00 00]; + status = "disabled"; }; cpsw_port2: port@2 {@@ -704,6 +706,7 @@ cpsw_port2: port@2 { label = "port2"; phys = <&phy_gmii_sel 2>; mac-address = [00 00 00 00 00 00]; + status = "disabled"; }; };arch/arm64/boot/dts/ti/k3-am62p5-sk.dts +3
-0@@ -431,16 +431,19 @@ &cpsw3g { pinctrl-names = "default"; pinctrl-0 = <&main_rgmii1_pins_default>, <&main_rgmii2_pins_default>; + status = "okay"; }; &cpsw_port1 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy0>; + status = "okay"; }; &cpsw_port2 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy1>; + status = "okay"; }; &cpsw3g_mdio {arch/arm64/boot/dts/ti/k3-j722s-evm.dts +1
-4@@ -226,10 +226,7 @@ cpsw3g_phy0: ethernet-phy@0 { &cpsw_port1 { phy-mode = "rgmii-rxid"; phy-handle = <&cpsw3g_phy0>; -}; - -&cpsw_port2 { - status = "disabled"; + status = "okay"; }; &main_gpio1 {
Hi Michael Walle,
Quoted 8 lines · Michael Walle
Device tree best practice is to disable any external interface in the dtsi and just enable them if needed in the device tree. Thus, disable the ethernet switch and its ports by default and just enable the ones used by the EVMs in their device trees.
There is no functional change.
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/1] arm64: dts: ti: k3-{am62p,j722s}: Disable ethernet by default
commit: f3d27e84814641192570fbe7a1cfdbb741a250e8
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D