The Ethernet switch embedded within the NXP LS1028A has 2 Ethernet ports
towards the host, for local packet termination. In current device trees,
only the first port is enabled. Enabling the second port allows having a
higher termination throughput.
Care has been taken that this change does not produce regressions when
using updated device trees with old kernels that do not support multiple
DSA CPU ports. The only difference for old kernels will be the
appearance of a new net device (for &enetc_port3) which will not be very
useful for much of anything.
Vladimir Oltean (3):
arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi
arm64: dts: ls1028a: mark enetc port 3 as a DSA master too
arm64: dts: ls1028a: enable swp5 and eno3 for all boards
.../dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 9 ++++++++-
.../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 9 ++++++++-
arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 9 ++++++++-
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 ++
4 files changed, 26 insertions(+), 3 deletions(-)
--
2.34.1
From: Vladimir Oltean <[email protected]>
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 <[email protected]>
Acked-by: Michael Walle <[email protected]>
---
v1->v2: keep 'status' property last
.../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..1215fcdf70fa 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -1156,6 +1156,7 @@ mscc_felix_port3: port@3 {
mscc_felix_port4: port@4 {
reg = <4>;
phy-mode = "internal";
+ ethernet = <&enetc_port2>;
status = "disabled";
fixed-link {
--
2.34.1
On Wed, Aug 31, 2022 at 07:01:21PM +0300, Vladimir Oltean wrote:
> The Ethernet switch embedded within the NXP LS1028A has 2 Ethernet ports
> towards the host, for local packet termination. In current device trees,
> only the first port is enabled. Enabling the second port allows having a
> higher termination throughput.
>
> Care has been taken that this change does not produce regressions when
> using updated device trees with old kernels that do not support multiple
> DSA CPU ports. The only difference for old kernels will be the
> appearance of a new net device (for &enetc_port3) which will not be very
> useful for much of anything.
>
> Vladimir Oltean (3):
> arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi
> arm64: dts: ls1028a: mark enetc port 3 as a DSA master too
> arm64: dts: ls1028a: enable swp5 and eno3 for all boards
Applied all, thanks!