Copy the board device tree files from linux v5.14. On top of the v5.14
dtbs the changes of these two patches are included here which are needed
for u-boot:
https://lore.kernel.org/linux-devicetree/20210831134013.1625527-7-mich...@walle.cc/
https://lore.kernel.org/linux-devicetree/20210831134013.1625527-8-mich...@walle.cc/
At the time of this writing the patches were accepted and will be
included in 5.15.
Signed-off-by: Michael Walle
Reviewed-by: Vladimir Oltean
---
.../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 12 +-
.../arm/dts/fsl-ls1028a-kontron-sl28-var1.dts | 31 +--
.../fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 8 +
.../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 40 +--
.../arm/dts/fsl-ls1028a-kontron-sl28-var4.dts | 16 +-
arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 250 +++---
6 files changed, 265 insertions(+), 92 deletions(-)
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 25aa274765..8538ce7984 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -4,12 +4,9 @@
/ {
aliases {
- mmc0 =
- mmc1 =
i2c0 =
i2c1 =
i2c2 =
- rtc0 =
ethernet2 = _port2;
ethernet3 = _port3;
};
@@ -234,11 +231,6 @@
};
#endif
- {
- rtc: rtc@32 {
- };
-};
-
{
u-boot,dm-pre-reloc;
flash@0 {
@@ -279,6 +271,10 @@
status = "okay";
};
+ {
+ status = "okay";
+};
+
{
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
index ba2e4de96d..7cd29ab970 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts
@@ -8,7 +8,7 @@
* None of the four SerDes lanes are used by the module, instead they are
* all led out to the carrier for customer use.
*
- * Copyright (C) 2020 Michael Walle
+ * Copyright (C) 2021 Michael Walle
*
*/
@@ -21,28 +21,17 @@
compatible = "kontron,sl28-var1", "kontron,sl28", "fsl,ls1028a";
};
-_port0 {
- status = "disabled";
- /delete-property/ phy-handle;
-};
-
-_port1 {
- phy-handle = <>;
- phy-mode = "rgmii-id";
- status = "okay";
-};
-
-/delete-node/
_mdio_pf3 {
+ /* Delete unused phy node */
+ /delete-node/ ethernet-phy@5;
+
phy0: ethernet-phy@4 {
reg = <0x4>;
eee-broken-1000t;
eee-broken-100tx;
-
qca,clk-out-frequency = <12500>;
qca,clk-out-strength = ;
qca,keep-pll-enabled;
-
vddio-supply = <>;
vddio: vddio-regulator {
@@ -56,3 +45,15 @@
};
};
};
+
+_port0 {
+ status = "disabled";
+ /* Delete the phy-handle to the old phy0 label */
+ /delete-property/ phy-handle;
+};
+
+_port1 {
+ phy-handle = <>;
+ phy-mode = "rgmii-id";
+ status = "okay";
+};
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 4e0ce3f77d..c010ea0dc7 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
@@ -7,3 +7,11 @@
ethernet1 = _felix_port1;
};
};
+
+_felix_port0 {
+ label = "gbe0";
+};
+
+_felix_port1 {
+ label = "gbe1";
+};
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
index db80874f4e..330e34f933 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts
@@ -2,10 +2,10 @@
/*
* Device Tree file for the Kontron SMARC-sAL28 board.
*
- * This is for the network variant 2 which has no ethernet support in the
- * bootloader.
+ * This is for the network variant 2 which has two ethernet ports. These
+ * ports are connected to the internal switch.
*
- * Copyright (C) 2020 Michael Walle
+ * Copyright (C) 2021 Michael Walle
*
*/
@@ -17,8 +17,21 @@
compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a";
};
+_mdio_pf3 {
+ phy1: ethernet-phy@4 {
+ reg = <0x4>;
+ eee-broken-1000t;
+ eee-broken-100tx;
+ };
+};
+
_port0 {
status = "disabled";
+ /*
+* In the base device tree the PHY at address 5 was assigned for
+* this port. On this module this PHY is connected to a switch
+* port instead. Therefore, delete the phy-handle property here.
+*/
/delete-property/ phy-handle;
};
@@ -31,14 +44,16 @@
};
_felix_port0 {
- label = "gbe0";
+ label = "swp0";
+ managed = "in-band-status";
phy-handle = <>;