| Message ID | 20220818140519.2767771-2-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NXP LS1028A DT changes for multiple switch CPU ports | expand |
Am 2022-08-18 16:05, schrieb Vladimir Oltean: > Since the CPU port 4 of the switch is hardwired inside the SoC to go to > the enetc port 2, this shouldn't be something that the board files need > to set (but whether that CPU port is used or not is another > discussion). > > So move the DSA "ethernet" property to the common dtsi. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > .../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 1 - > arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 1 - > arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 - > arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + > 4 files changed, 1 insertion(+), 3 deletions(-) > > diff --git > a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts > index 6b575efd84a7..52ef2e8e5492 100644 > --- > a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts > +++ > b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts > @@ -104,7 +104,6 @@ &mscc_felix_port3 { > }; > > &mscc_felix_port4 { > - ethernet = <&enetc_port2>; > status = "okay"; > }; > > diff --git > a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts > index 330e34f933a3..37c20cb6c152 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts > @@ -60,6 +60,5 @@ &mscc_felix_port1 { > }; > > &mscc_felix_port4 { > - ethernet = <&enetc_port2>; > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > index e0cd1516d05b..7285bdcf2302 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts > @@ -278,7 +278,6 @@ &mscc_felix_port3 { > }; > > &mscc_felix_port4 { > - ethernet = <&enetc_port2>; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > index 5627dd7734f3..3da105119d82 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi > @@ -1157,6 +1157,7 @@ mscc_felix_port4: port@4 { > reg = <4>; > phy-mode = "internal"; > status = "disabled"; > + ethernet = <&enetc_port2>; same here, status should probably the last one. except from that: Acked-by: Michael Walle <michael@walle.cc> > > fixed-link { > speed = <2500>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts index 6b575efd84a7..52ef2e8e5492 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts @@ -104,7 +104,6 @@ &mscc_felix_port3 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts index 330e34f933a3..37c20cb6c152 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts @@ -60,6 +60,5 @@ &mscc_felix_port1 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts index e0cd1516d05b..7285bdcf2302 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts @@ -278,7 +278,6 @@ &mscc_felix_port3 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 5627dd7734f3..3da105119d82 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -1157,6 +1157,7 @@ mscc_felix_port4: port@4 { reg = <4>; phy-mode = "internal"; status = "disabled"; + ethernet = <&enetc_port2>; fixed-link { speed = <2500>;
Since the CPU port 4 of the switch is hardwired inside the SoC to go to the enetc port 2, this shouldn't be something that the board files need to set (but whether that CPU port is used or not is another discussion). So move the DSA "ethernet" property to the common dtsi. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- .../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + 4 files changed, 1 insertion(+), 3 deletions(-)