[PATCH] ARM: dts: am335x: update cpsw nodes

[Yegor Yefremov]

Hi Ahmad,

On Wed, Jul 6, 2022 at 7:44 AM Ahmad Fatoum <a.fatoum at pengutronix.de> wrote:
>
> Hello Yegor,
>
> On 04.07.22 13:49, yegorslists at googlemail.com wrote:
> > From: Yegor Yefremov <yegorslists at googlemail.com>
> >
> > Switch to cpsw switchdev definition.
>
> Both bindings should be supported by the same driver in barebox.
> Is this just to align with your Linux DT or did you experience breakage?

barebox couldn't start, because cpsw initialization failed.

Aligning with the upstream Linux DTS was also required, otherwise, the
MACs were set for the old network nodes, and switchdev ones used
internal MAC from TI.

Yegor

> > Signed-off-by: Yegor Yefremov <yegorslists at googlemail.com>
> > ---
> >  arch/arm/dts/am335x-baltos-minimal.dts | 29 ++++++++++++++++----------
> >  1 file changed, 18 insertions(+), 11 deletions(-)
> >
> > diff --git a/arch/arm/dts/am335x-baltos-minimal.dts b/arch/arm/dts/am335x-baltos-minimal.dts
> > index dff901f050..e55a2d7cbb 100644
> > --- a/arch/arm/dts/am335x-baltos-minimal.dts
> > +++ b/arch/arm/dts/am335x-baltos-minimal.dts
> > @@ -399,33 +399,40 @@
> >       };
> >  };
> >
> > -&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>;
> >       pinctrl-1 = <&davinci_mdio_sleep>;
> >
> > -     status = "okay";
> > +     phy1: ethernet-phy at 1 {
> > +             reg = <7>;
> > +             eee-broken-100tx;
> > +             eee-broken-1000t;
> > +     };
> >  };
> >
> > -&cpsw_emac0 {
> > -     phy_id = <&davinci_mdio>, <0>;
> > +&cpsw_port1 {
> >       phy-mode = "rmii";
> > -     dual_emac_res_vlan = <1>;
> > +     ti,dual-emac-pvid = <1>;
> > +     fixed-link {
> > +             speed = <100>;
> > +             full-duplex;
> > +     };
> >  };
> >
> > -&cpsw_emac1 {
> > -     phy_id = <&davinci_mdio>, <7>;
> > -     phy-mode = "rgmii-txid";
> > -     dual_emac_res_vlan = <2>;
> > +&cpsw_port2 {
> > +     phy-mode = "rgmii-id";
> > +     ti,dual-emac-pvid = <2>;
> > +     phy-handle = <&phy1>;
> >  };
> >
> >  &mmc1 {
>
>
> --
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |