1. Patchew
  2. linux
  3. View series

[PATCH] arm64: dts: ti: k3-am64* Disable ethernet by default at SoC level

Logan Bristol posted 1 patch 1 year, 6 months ago
There is a newer version of this series
arch/arm64/boot/dts/ti/k3-am64-main.dtsi                 | 3 +++
arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi          | 4 ----
arch/arm64/boot/dts/ti/k3-am642-evm.dts                  | 3 +++
arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts       | 8 ++++++++
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 8 ++++++++
arch/arm64/boot/dts/ti/k3-am642-sk.dts                   | 3 +++
arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi              | 4 ----
arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts   | 6 ++----
8 files changed, 27 insertions(+), 12 deletions(-)
[PATCH] arm64: dts: ti: k3-am64* Disable ethernet by default at SoC level
Posted by Logan Bristol 1 year, 6 months ago 
External interfaces should be disabled at the SoC DTSI level, since 
the node is incomplete. The node should then be enabled in the board DTS. 
Disable ethernet switch and ports in SoC DTSI and enable them in the board 
DTS.

Reflect this change in SoM DTSIs by removing ethernet port disable.

Signed-off-by: Logan Bristol <logan.bristol@utexas.edu>
---
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi                 | 3 +++
 arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi          | 4 ----
 arch/arm64/boot/dts/ti/k3-am642-evm.dts                  | 3 +++
 arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts       | 8 ++++++++
 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 8 ++++++++
 arch/arm64/boot/dts/ti/k3-am642-sk.dts                   | 3 +++
 arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi              | 4 ----
 arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts   | 6 ++----
 8 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index f8370dd03350..69c5af58b727 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -677,6 +677,7 @@ cpsw3g: ethernet@8000000 {
 		assigned-clock-parents = <&k3_clks 13 9>;
 		clock-names = "fck";
 		power-domains = <&k3_pds 13 TI_SCI_PD_EXCLUSIVE>;
+		status = "disabled";
 
 		dmas = <&main_pktdma 0xC500 15>,
 		       <&main_pktdma 0xC501 15>,
@@ -701,6 +702,7 @@ cpsw_port1: port@1 {
 				phys = <&phy_gmii_sel 1>;
 				mac-address = [00 00 00 00 00 00];
 				ti,syscon-efuse = <&main_conf 0x200>;
+				status = "disabled";
 			};
 
 			cpsw_port2: port@2 {
@@ -709,6 +711,7 @@ cpsw_port2: port@2 {
 				label = "port2";
 				phys = <&phy_gmii_sel 2>;
 				mac-address = [00 00 00 00 00 00];
+				status = "disabled";
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
index ea7c58fb67e2..ec269742d060 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
@@ -210,10 +210,6 @@ &cpsw_port1 {
 	phy-handle = <&cpsw3g_phy1>;
 };
 
-&cpsw_port2 {
-	status = "disabled";
-};
-
 &mailbox0_cluster2 {
 	status = "okay";
 
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 6bb1ad2e56ec..82da21bd9aea 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -616,17 +616,20 @@ &cpsw3g {
 	bootph-all;
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins_default>, <&rgmii2_pins_default>;
+	status = "okay";
 };
 
 &cpsw_port1 {
 	bootph-all;
 	phy-mode = "rgmii-rxid";
 	phy-handle = <&cpsw3g_phy0>;
+	status = "okay";
 };
 
 &cpsw_port2 {
 	phy-mode = "rgmii-rxid";
 	phy-handle = <&cpsw3g_phy3>;
+	status = "okay";
 };
 
 &cpsw3g_mdio {
diff --git a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
index 5b5e9eeec5ac..90ffc426cae1 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
@@ -89,6 +89,14 @@ serdes_mux: mux-controller {
 	};
 };
 
+&cpsw3g {
+	status = "okay";
+};
+
+&cpsw_port1 {
+	status ="okay";
+};
+
 &main_gpio0 {
 	m2-reset-hog {
 		gpio-hog;
diff --git a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
index 30729b49dd69..d43270fad441 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
@@ -198,6 +198,14 @@ AM64X_IOPAD(0x0040, PIN_OUTPUT, 7)	/* (U21) GPMC0_AD1.GPIO0_16 */
 	};
 };
 
+&cpsw3g {
+	status = "okay";
+};
+
+&cpsw_port1 {
+	status = "okay";
+};
+
 &main_i2c1 {
 	status = "okay";
 	pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 44ecbcf1c844..86369525259c 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -527,16 +527,19 @@ &usb0 {
 &cpsw3g {
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins_default>, <&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 {
diff --git a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
index c19d0b8bbf0f..995e2703030b 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
@@ -212,10 +212,6 @@ &cpsw_port1 {
 	phy-handle = <&ethernet_phy0>;
 };
 
-&cpsw_port2 {
-	status = "disabled";
-};
-
 &icssg1_mdio {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pru1_mdio0_default_pins>;
diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
index c40ad67cee01..8d7a0283c391 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
@@ -119,15 +119,13 @@ reg_sd: regulator-sd {
 &cpsw3g {
 	pinctrl-names = "default";
 	pinctrl-0 = <&cpsw_pins>;
+	status = "okay";
 };
 
 &cpsw_port1 {
 	phy-mode = "rgmii-rxid";
 	phy-handle = <&cpsw3g_phy0>;
-};
-
-&cpsw_port2 {
-	status = "disabled";
+	status = "okay";
 };
 
 &cpsw3g_mdio {
-- 
2.34.1
Re: [PATCH] arm64: dts: ti: k3-am64* Disable ethernet by default at SoC level
Posted by Josua Mayer 1 year, 6 months ago 
Am 08.08.24 um 00:13 schrieb Logan Bristol:
> External interfaces should be disabled at the SoC DTSI level, since
> the node is incomplete. The node should then be enabled in the board DTS.
> Disable ethernet switch and ports in SoC DTSI and enable them in the board
> DTS.
>
> Reflect this change in SoM DTSIs by removing ethernet port disable.
>
> Signed-off-by: Logan Bristol <logan.bristol@utexas.edu>
> ---
>   arch/arm64/boot/dts/ti/k3-am64-main.dtsi                 | 3 +++
>   arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi          | 4 ----
>   arch/arm64/boot/dts/ti/k3-am642-evm.dts                  | 3 +++
>   arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts       | 8 ++++++++
>   arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 8 ++++++++
>   arch/arm64/boot/dts/ti/k3-am642-sk.dts                   | 3 +++
>   arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi              | 4 ----
>   arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts   | 6 ++----
>   8 files changed, 27 insertions(+), 12 deletions(-)
cut
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
> index 5b5e9eeec5ac..90ffc426cae1 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
> @@ -89,6 +89,14 @@ serdes_mux: mux-controller {
>   	};
>   };
>   
> +&cpsw3g {
> +	status = "okay";
> +};
> +
> +&cpsw_port1 {
> +	status ="okay";
> +};
> +
SolidRun AM642 SoM has ethernet phys on the SoM itself,
carrier only provides physical connector.

Therefore the ports status should be set in som dtsi,
where we also set pinctrl and phy-handle.

>   &main_gpio0 {
>   	m2-reset-hog {
>   		gpio-hog;
cut
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
> index c19d0b8bbf0f..995e2703030b 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
> @@ -212,10 +212,6 @@ &cpsw_port1 {
>   	phy-handle = <&ethernet_phy0>;
>   };
>   
Please enable cpsw3g and cpsw_port1 status here.
> -&cpsw_port2 {
> -	status = "disabled";
> -};
> -
>   &icssg1_mdio {
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&pru1_mdio0_default_pins>;
Re: [PATCH] arm64: dts: ti: k3-am64* Disable ethernet by default at SoC level
Posted by Logan Bristol 1 year, 6 months ago 

On 8/8/2024 1:50 AM, Josua Mayer wrote:
> Am 08.08.24 um 00:13 schrieb Logan Bristol:
>> External interfaces should be disabled at the SoC DTSI level, since
>> the node is incomplete. The node should then be enabled in the board DTS.
>> Disable ethernet switch and ports in SoC DTSI and enable them in the board
>> DTS.
>>
>> Reflect this change in SoM DTSIs by removing ethernet port disable.
>>
>> Signed-off-by: Logan Bristol <logan.bristol@utexas.edu>
>> ---
>>    arch/arm64/boot/dts/ti/k3-am64-main.dtsi                 | 3 +++
>>    arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi          | 4 ----
>>    arch/arm64/boot/dts/ti/k3-am642-evm.dts                  | 3 +++
>>    arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts       | 8 ++++++++
>>    arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 8 ++++++++
>>    arch/arm64/boot/dts/ti/k3-am642-sk.dts                   | 3 +++
>>    arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi              | 4 ----
>>    arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts   | 6 ++----
>>    8 files changed, 27 insertions(+), 12 deletions(-)
> cut
>> diff --git a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
>> index 5b5e9eeec5ac..90ffc426cae1 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
>> @@ -89,6 +89,14 @@ serdes_mux: mux-controller {
>>    	};
>>    };
>>    
>> +&cpsw3g {
>> +	status = "okay";
>> +};
>> +
>> +&cpsw_port1 {
>> +	status ="okay";
>> +};
>> +
> SolidRun AM642 SoM has ethernet phys on the SoM itself,
> carrier only provides physical connector.
> 
> Therefore the ports status should be set in som dtsi,
> where we also set pinctrl and phy-handle.
> 
>>    &main_gpio0 {
>>    	m2-reset-hog {
>>    		gpio-hog;
> cut
>> diff --git a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
>> index c19d0b8bbf0f..995e2703030b 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
>> +++ b/arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
>> @@ -212,10 +212,6 @@ &cpsw_port1 {
>>    	phy-handle = <&ethernet_phy0>;
>>    };
>>    
> Please enable cpsw3g and cpsw_port1 status here.

I will make this change.

Thank you,
Logan Bristol

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.