All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Vignesh Raghavendra <vigneshr@ti.com>,
	<linux-omap@vger.kernel.org>,
	Grygorii Strashko <grygorii.strashko@ti.com>,
	Teresa Remmet <t.remmet@phytec.de>
Subject: [PATCH next 12/15] ARM: dts: am335x-phycore: switch to new cpsw switch drv
Date: Sat, 12 Jun 2021 04:14:33 +0300	[thread overview]
Message-ID: <20210612011436.10437-13-grygorii.strashko@ti.com> (raw)
In-Reply-To: <20210612011436.10437-1-grygorii.strashko@ti.com>

The dual_mac mode has been preserved the same way between legacy and new
driver, and one port devices works the same as 1 dual_mac port - it's safe
to switch drivers.

So, switch Phytec AM335x phyCORE SOM, phyBOARD-WEGA, phyBOARD-REGOR,
PCM-953 to use new cpsw switch driver. Those boards have or 2 Ext. port
wired and configured in dual_mac mode by default, or only 1 Ext. port.

Cc: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 arch/arm/boot/dts/am335x-pcm-953.dtsi     | 10 ++++------
 arch/arm/boot/dts/am335x-phycore-som.dtsi | 14 ++++++++------
 arch/arm/boot/dts/am335x-regor.dtsi       | 11 +++++------
 arch/arm/boot/dts/am335x-wega.dtsi        | 11 +++++------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi
index 6c547c83e5dd..124026fa0d09 100644
--- a/arch/arm/boot/dts/am335x-pcm-953.dtsi
+++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -123,24 +123,22 @@
 	};
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
 	phy-handle = <&phy1>;
 	phy-mode = "rgmii-id";
-	dual_emac_res_vlan = <2>;
+	ti,dual-emac-pvid = <2>;
 	status = "okay";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
 	phy1: ethernet-phy@2 {
 		reg = <2>;
 	};
 };
 
-&mac {
-	slaves = <2>;
+&mac_sw {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
-	dual_emac;
 };
 
 /* Misc */
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 7e46b4c02709..f65cd1331315 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -97,24 +97,26 @@
 	};
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
 	phy-handle = <&phy0>;
 	phy-mode = "rmii";
-	dual_emac_res_vlan = <1>;
+	ti,dual-emac-pvid = <1>;
 };
 
-&davinci_mdio {
+&cpsw_port2 {
+	status = "disabled";
+};
+
+&davinci_mdio_sw {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mdio_pins>;
-	status = "okay";
 
 	phy0: ethernet-phy@0 {
 		reg = <0>;
 	};
 };
 
-&mac {
-	slaves = <1>;
+&mac_sw {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ethernet0_pins>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/am335x-regor.dtsi b/arch/arm/boot/dts/am335x-regor.dtsi
index 6fbf4ac739e7..7b3966ee51b9 100644
--- a/arch/arm/boot/dts/am335x-regor.dtsi
+++ b/arch/arm/boot/dts/am335x-regor.dtsi
@@ -85,23 +85,22 @@
 	};
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+	status = "okay";
 	phy-handle = <&phy1>;
 	phy-mode = "mii";
-	dual_emac_res_vlan = <2>;
+	ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
 	phy1: ethernet-phy@1 {
 		reg = <1>;
 	};
 };
 
-&mac {
-	slaves = <2>;
+&mac_sw {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
-	dual_emac = <1>;
 };
 
 /* GPIOs */
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index 1359bf8715e6..673159d93a6a 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -111,23 +111,22 @@
 	};
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+	status = "okay";
 	phy-handle = <&phy1>;
 	phy-mode = "mii";
-	dual_emac_res_vlan = <2>;
+	ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
 	phy1: ethernet-phy@1 {
 		reg = <1>;
 	};
 };
 
-&mac {
-	slaves = <2>;
+&mac_sw {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
-	dual_emac = <1>;
 };
 
 /* MMC */
-- 
2.17.1


  parent reply	other threads:[~2021-06-12  1:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-12  1:14 [PATCH next 00/15] ARM: dts: am335x: switch rest boards to new cpsw switch drv Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 01/15] ARM: dts: am335x-baltos: switch " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 02/15] ARM: dts: am335x-nano: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 03/15] ARM: dts: am335x-chiliboard: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 04/15] ARM: dts: am335x-cm-t335: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 05/15] ARM: dts: am335x-igep0033: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 06/15] ARM: dts: am335x-lxm: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 07/15] ARM: dts: am335x-moxa-uc: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 08/15] ARM: dts: am335x-myirtech: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 09/15] ARM: dts: am335x-osd3358-sm-red: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 10/15] ARM: dts: am335x-pdu001: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 11/15] ARM: dts: am335x-pepper: " Grygorii Strashko
2021-06-12  1:14 ` Grygorii Strashko [this message]
2021-06-12  1:14 ` [PATCH next 13/15] ARM: dts: am335x-shc: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 14/15] ARM: dts: am335x-sl50: " Grygorii Strashko
2021-06-12  1:14 ` [PATCH next 15/15] ARM: dts: am33xx: update ethernet aliases Grygorii Strashko
2021-08-06  6:29 ` [PATCH next 00/15] ARM: dts: am335x: switch rest boards to new cpsw switch drv Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210612011436.10437-13-grygorii.strashko@ti.com \
    --to=grygorii.strashko@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=lokeshvutla@ti.com \
    --cc=t.remmet@phytec.de \
    --cc=tony@atomide.com \
    --cc=vigneshr@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.