mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

ARM: dts: am335x-baltos: switch to new cpsw switch drv

Browse source 
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 OnRISC Baltos and NetCom/Cam boards 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: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Christina Quast <cquast@hanoverdisplays.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Grygorii Strashko 2021-06-12 04:14:22 +03:00 committed by Tony Lindgren
parent 8c054cd281
commit 1c7ba565e7
7 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/boot/dts/am335x-baltos-ir2110.dts
View file

@ -58,21 +58,21 @@ &usb0 {
dr_mode = "host";
};
&davinci_mdio {
&davinci_mdio_sw {
phy0: ethernet-phy@0 {
reg = <1>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
phy-handle = <&phy0>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};

8
arch/arm/boot/dts/am335x-baltos-ir3220.dts
View file

@ -103,18 +103,18 @@ &usb0 {
dr_mode = "host";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
fixed-link {
speed = <100>;
full-duplex;
};
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};

8
arch/arm/boot/dts/am335x-baltos-ir5221.dts
View file

@ -120,18 +120,18 @@ &usb1 {
dr_mode = "host";
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
fixed-link {
speed = <100>;
full-duplex;
};
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};

5
arch/arm/boot/dts/am335x-baltos.dtsi
View file

@ -339,16 +339,15 @@ vmmc_reg: regulator@12 {
};
};
&mac {
&mac_sw {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;

10
arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
View file

@ -61,21 +61,21 @@ &usb0 {
dr_mode = "host";
};
&davinci_mdio {
&davinci_mdio_sw {
phy0: ethernet-phy@0 {
reg = <1>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
phy-handle = <&phy0>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};

10
arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
View file

@ -76,20 +76,20 @@ &uart2 {
status = "okay";
};
&davinci_mdio {
&davinci_mdio_sw {
phy0: ethernet-phy@0 {
reg = <1>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
phy-handle = <&phy0>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};

10
arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
View file

@ -96,20 +96,20 @@ tca6416c: gpio@21 {
};
};
&davinci_mdio {
&davinci_mdio_sw {
phy0: ethernet-phy@0 {
reg = <1>;
};
};
&cpsw_emac0 {
&cpsw_port1 {
phy-mode = "rmii";
dual_emac_res_vlan = <1>;
ti,dual-emac-pvid = <1>;
phy-handle = <&phy0>;
};
&cpsw_emac1 {
&cpsw_port2 {
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
ti,dual-emac-pvid = <2>;
phy-handle = <&phy1>;
};