lkml.org 
[lkml]   [2021]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH next 12/15] ARM: dts: am335x-phycore: switch to new cpsw switch drv
    Date
    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
    \
     
     \ /
      Last update: 2021-06-12 03:17    [W:4.168 / U:0.852 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site