Message ID | 20210623115602.5015-1-michael@walle.cc |
---|---|
State | Accepted |
Commit | 515ed9df24c91d4447986cf35c249aaf04a71f5a |
Delegated to: | Ramon Fried |
Headers | show |
Series | [v2] board: sl28: add DSA support for variant 2 | expand |
Am 2021-06-23 13:56, schrieb Michael Walle: > Now that u-boot gained DSA support, and it is already enabled for the > kontron_sl28 board, add the last missing piece and enable the > corresponding devices it in the device tree. > > Signed-off-by: Michael Walle <michael@walle.cc> > --- > changes since v1: > - renamed ethernet alias stem, because it was changed in > commit 82a3c9ef20d43d97416589854b4bbcb4c2450c24 ("net: use the same > alias stem for ethernet as linux") > > Now that the mentioned commit made it finally into u-boot. We can move > forward here. It would be nice if this would still make it into > 2021.07, > given that this is only a device tree change for a this particular > board. Can this please go through the net queue? By chance, I've seen this patch: https://patchwork.ozlabs.org/project/uboot/patch/20210629175317.2607470-5-vladimir.oltean@nxp.com/ Now I'm lucky that I have the following chunk, otherwise the patch wouldn't work. +&enetc2 { + status = "okay"; +}; In any case, I'd retest this patch today based on u-boot-net/master (together with Vladimirs new patch series which configures the autoneg at probe time). -michael > > .../fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 7 ++++ > .../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 40 +++++++++++++++++++ > 2 files changed, 47 insertions(+) > > diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi > b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi > index 79b771e074..4e0ce3f77d 100644 > --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi > +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi > @@ -1,2 +1,9 @@ > // SPDX-License-Identifier: GPL-2.0+ > #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" > + > +/ { > + aliases { > + ethernet0 = &mscc_felix_port0; > + ethernet1 = &mscc_felix_port1; > + }; > +}; > diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts > b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts > index 1ea1265bcf..7a3aa21408 100644 > --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts > +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts > @@ -22,4 +22,44 @@ > /delete-property/ phy-handle; > }; > > +&enetc2 { > + status = "okay"; > +}; > + > +&mscc_felix { > + status = "okay"; > +}; > + > +&mscc_felix_port0 { > + label = "gbe0"; > + phy-handle = <&phy0>; > + phy-mode = "sgmii"; > + status = "okay"; > +}; > + > +&mscc_felix_port1 { > + label = "gbe1"; > + phy-handle = <&phy1>; > + phy-mode = "sgmii"; > + status = "okay"; > +}; > + > +&mscc_felix_port4 { > + ethernet = <&enetc2>; > + status = "okay"; > +}; > + > /delete-node/ &phy0; > +&mdio0 { > + phy0: ethernet-phy@5 { > + reg = <0x5>; > + eee-broken-1000t; > + eee-broken-100tx; > + }; > + > + phy1: ethernet-phy@4 { > + reg = <0x4>; > + eee-broken-1000t; > + eee-broken-100tx; > + }; > +};
On Wed, Jun 30, 2021 at 10:26:57AM +0200, Michael Walle wrote: > Can this please go through the net queue? > > By chance, I've seen this patch: > https://patchwork.ozlabs.org/project/uboot/patch/20210629175317.2607470-5-vladimir.oltean@nxp.com/ > > Now I'm lucky that I have the following chunk, otherwise the patch wouldn't > work. > > +&enetc2 { > + status = "okay"; > +}; Why "lucky"? I remember you were pushing this device tree style in the first place. > In any case, I'd retest this patch today based on u-boot-net/master > (together > with Vladimirs new patch series which configures the autoneg at probe time). I think it's best to just resend with Ramon in CC once you retest.
Am 2021-06-30 12:34, schrieb Vladimir Oltean: > On Wed, Jun 30, 2021 at 10:26:57AM +0200, Michael Walle wrote: >> Can this please go through the net queue? >> >> By chance, I've seen this patch: >> https://patchwork.ozlabs.org/project/uboot/patch/20210629175317.2607470-5-vladimir.oltean@nxp.com/ >> >> Now I'm lucky that I have the following chunk, otherwise the patch >> wouldn't >> work. >> >> +&enetc2 { >> + status = "okay"; >> +}; > > Why "lucky"? I remember you were pushing this device tree style in the > first place. Thats correct, but in u-boot this device was still defaulting to status = "okay", thus it would have been superfluous to still enable it in the board dts. And tbh, I don't exactly know why I enabled it nonetheless. Normally I keep things small ;) Its not about the change (which is good), but there seems to be a disconnect between which patches goes through which queue and you have to be lucky that a (newer) patch doesn't break your patch which is sitting on another queue to be picked up while the newer one is already pulled in.
On Wed, Jun 30, 2021 at 2:21 PM Michael Walle <michael@walle.cc> wrote: > > Am 2021-06-30 12:34, schrieb Vladimir Oltean: > > On Wed, Jun 30, 2021 at 10:26:57AM +0200, Michael Walle wrote: > >> Can this please go through the net queue? > >> > >> By chance, I've seen this patch: > >> https://patchwork.ozlabs.org/project/uboot/patch/20210629175317.2607470-5-vladimir.oltean@nxp.com/ > >> > >> Now I'm lucky that I have the following chunk, otherwise the patch > >> wouldn't > >> work. > >> > >> +&enetc2 { > >> + status = "okay"; > >> +}; > > > > Why "lucky"? I remember you were pushing this device tree style in the > > first place. > > Thats correct, but in u-boot this device was still defaulting to > status = "okay", thus it would have been superfluous to still enable > it in the board dts. And tbh, I don't exactly know why I enabled > it nonetheless. Normally I keep things small ;) > > Its not about the change (which is good), but there seems to be > a disconnect between which patches goes through which queue and > you have to be lucky that a (newer) patch doesn't break your patch > which is sitting on another queue to be picked up while the newer > one is already pulled in. > > -- > -michael Applied to u-boot-net/master, Thanks ! Ramon
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi index 79b771e074..4e0ce3f77d 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi @@ -1,2 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" + +/ { + aliases { + ethernet0 = &mscc_felix_port0; + ethernet1 = &mscc_felix_port1; + }; +}; diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts index 1ea1265bcf..7a3aa21408 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts @@ -22,4 +22,44 @@ /delete-property/ phy-handle; }; +&enetc2 { + status = "okay"; +}; + +&mscc_felix { + status = "okay"; +}; + +&mscc_felix_port0 { + label = "gbe0"; + phy-handle = <&phy0>; + phy-mode = "sgmii"; + status = "okay"; +}; + +&mscc_felix_port1 { + label = "gbe1"; + phy-handle = <&phy1>; + phy-mode = "sgmii"; + status = "okay"; +}; + +&mscc_felix_port4 { + ethernet = <&enetc2>; + status = "okay"; +}; + /delete-node/ &phy0; +&mdio0 { + phy0: ethernet-phy@5 { + reg = <0x5>; + eee-broken-1000t; + eee-broken-100tx; + }; + + phy1: ethernet-phy@4 { + reg = <0x4>; + eee-broken-1000t; + eee-broken-100tx; + }; +};
Now that u-boot gained DSA support, and it is already enabled for the kontron_sl28 board, add the last missing piece and enable the corresponding devices it in the device tree. Signed-off-by: Michael Walle <michael@walle.cc> --- changes since v1: - renamed ethernet alias stem, because it was changed in commit 82a3c9ef20d43d97416589854b4bbcb4c2450c24 ("net: use the same alias stem for ethernet as linux") Now that the mentioned commit made it finally into u-boot. We can move forward here. It would be nice if this would still make it into 2021.07, given that this is only a device tree change for a this particular board. .../fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 7 ++++ .../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 40 +++++++++++++++++++ 2 files changed, 47 insertions(+)