Skip to contentSkip to conversation

arm64: dts: ls1028a: various sl28 fixes/updates

PATCH Applied Michael Walle 2 participants 6 messages Mar 11, 2020 – Mar 16, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover arm64: dts: ls1028a: various sl28 fixes/updates

Hi,

this patchset contains device tree fixes and updates for the Kontron SMARC-sAL28 board.

Changes since v1:
- added "arm64: dts: freescale: sl28: add SPI flash" which was forgotten in the first series.

Michael Walle (4):
arm64: dts: freescale: sl28: add SPI flash
arm64: dts: ls1028a: sl28: fix on-board EEPROMS
arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS
arm64: dts: ls1028a: sl28: add support for variant 2

 arch/arm64/boot/dts/freescale/Makefile        |  1 +
 .../fsl-ls1028a-kontron-kbox-a-230-ls.dts     | 66 +++++++++++++++++-
 .../fsl-ls1028a-kontron-sl28-var2.dts         | 68 +++++++++++++++++++
 .../fsl-ls1028a-kontron-sl28-var3-ads2.dts    | 23 +++++--
 .../freescale/fsl-ls1028a-kontron-sl28.dts    | 12 ++++
 5 files changed, 161 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/4 arm64: dts: freescale: sl28: add SPI flash

There is a SPI flash on this carrier connected to the third DSPI controller. Add it.

---
 .../dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts | 9 +++++++++
 .../boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts      | 6 ++++++
 2 files changed, 15 insertions(+)
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts +9 -0
index 7de55f2aa7dc..7aee14193dbd 100644
@@ -68,6 +68,15 @@
 	};
 };
 
+&dspi2 {
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		m25p,fast-read;
+		spi-max-frequency = <100000000>;
+		reg = <0>;
+	};
+};
+
 &i2c4 {
 	status = "okay";
 
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts +6 -0
index e6ad2f64e64e..58603bce5b0e 100644
@@ -17,6 +17,8 @@
 		crypto = &crypto;
 		serial0 = &duart0;
 		serial1 = &duart1;
+		spi0 = &fspi;
+		spi1 = &dspi2;
 	};
 
 	chosen {
@@ -24,6 +26,10 @@
 	};
 };
 
+&dspi2 {
+	status = "okay";
+};
+
 &duart0 {
 	status = "okay";
 };
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/4 arm64: dts: ls1028a: sl28: fix on-board EEPROMS

In reply to Michael Walle

The module itself has another EEPROM at 50h on I2C4. The EEPROM on the carriers is located at 57h on I2C3. Fix that in the device trees.

---
 .../fsl-ls1028a-kontron-kbox-a-230-ls.dts          |  6 +++---
 .../fsl-ls1028a-kontron-sl28-var3-ads2.dts         | 14 ++++++++------
 .../dts/freescale/fsl-ls1028a-kontron-sl28.dts     |  6 ++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +3 -3
index aaf3c04771c3..32f6c80414bc 100644
@@ -18,10 +18,10 @@
 		     "kontron,sl28", "fsl,ls1028a";
 };
 
-&i2c4 {
-	eeprom@50 {
+&i2c3 {
+	eeprom@57 {
 		compatible = "atmel,24c32";
-		reg = <0x50>;
+		reg = <0x57>;
 		pagesize = <32>;
 	};
 };
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts +8 -6
index 7aee14193dbd..0973a6a45217 100644
@@ -77,6 +77,14 @@
 	};
 };
 
+&i2c3 {
+	eeprom@57 {
+		compatible = "atmel,24c64";
+		reg = <0x57>;
+		pagesize = <32>;
+	};
+};
+
 &i2c4 {
 	status = "okay";
 
@@ -89,12 +97,6 @@
 		assigned-clocks = <&mclk>;
 		assigned-clock-rates = <1250000>;
 	};
-
-	eeprom@50 {
-		compatible = "atmel,24c32";
-		reg = <0x50>;
-		pagesize = <32>;
-	};
 };
 
 &sai5 {
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts +6 -0
index 58603bce5b0e..1648a04ea79f 100644
@@ -178,4 +178,10 @@
 
 &i2c4 {
 	status = "okay";
+
+	eeprom@50 {
+		compatible = "atmel,24c32";
+		reg = <0x50>;
+		pagesize = <32>;
+	};
 };
Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 3/4 arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS

In reply to Michael Walle

The KBox A-230-LS supports four external ports which are connected to the internal switch of the LS1028A via QSGMII. Now that the Felix switch is supported, add these ports in the device tree.

---
 .../fsl-ls1028a-kontron-kbox-a-230-ls.dts     | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +60 -0
index 32f6c80414bc..4e30558485b0 100644
@@ -18,6 +18,29 @@
 		     "kontron,sl28", "fsl,ls1028a";
 };
 
+&enetc_mdio_pf3 {
+	/* BCM54140 QSGMII quad PHY */
+	qsgmii_phy0: ethernet-phy@7 {
+		reg = <7>;
+	};
+
+	qsgmii_phy1: ethernet-phy@8 {
+		reg = <8>;
+	};
+
+	qsgmii_phy2: ethernet-phy@9 {
+		reg = <9>;
+	};
+
+	qsgmii_phy3: ethernet-phy@10 {
+		reg = <10>;
+	};
+};
+
+&enetc_port2 {
+	status = "okay";
+};
+
 &i2c3 {
 	eeprom@57 {
 		compatible = "atmel,24c32";
@@ -25,3 +48,40 @@
 		pagesize = <32>;
 	};
 };
+
+&mscc_felix_port0 {
+	label = "swp0";
+	managed = "in-band-status";
+	phy-handle = <&qsgmii_phy0>;
+	phy-mode = "qsgmii";
+	status = "okay";
+};
+
+&mscc_felix_port1 {
+	label = "swp1";
+	managed = "in-band-status";
+	phy-handle = <&qsgmii_phy1>;
+	phy-mode = "qsgmii";
+	status = "okay";
+};
+
+&mscc_felix_port2 {
+	label = "swp2";
+	managed = "in-band-status";
+	phy-handle = <&qsgmii_phy2>;
+	phy-mode = "qsgmii";
+	status = "okay";
+};
+
+&mscc_felix_port3 {
+	label = "swp3";
+	managed = "in-band-status";
+	phy-handle = <&qsgmii_phy3>;
+	phy-mode = "qsgmii";
+	status = "okay";
+};
+
+&mscc_felix_port4 {
+	ethernet = <&enetc_port2>;
+	status = "okay";
+};
Signature · 1 line
2.20.1
#4 lore raw

PATCH v2 4/4 arm64: dts: ls1028a: sl28: add support for variant 2

In reply to Michael Walle

Now that there is support for the Felix switch this variant can also be added. It features two external ports ethernet ports which are connected to the internal switch core. No direct connection to any of the enetc's is supported.

---
 arch/arm64/boot/dts/freescale/Makefile        |  1 +
 .../fsl-ls1028a-kontron-sl28-var2.dts         | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
arch/arm64/boot/dts/freescale/Makefile +1 -0
index a6d70b73d69b..a39f0a1723e0 100644
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-kbox-a-230-ls.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28.dtb
+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var2.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var3-ads2.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-kontron-sl28-var4.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-qds.dtb
arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts new file +68 -0

68 lines not on this page · raw message

Signature · 1 line
2.20.1
Applied
#5 lore raw
In reply to Michael Walle
Quoted 9 lines · Michael Walle

Hi,

this patchset contains device tree fixes and updates for the Kontron SMARC-sAL28 board.

Changes since v1:
- added "arm64: dts: freescale: sl28: add SPI flash" which was forgotten in the first series.

Quoted 5 lines

Michael Walle (4):
arm64: dts: freescale: sl28: add SPI flash
arm64: dts: ls1028a: sl28: fix on-board EEPROMS
arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS
arm64: dts: ls1028a: sl28: add support for variant 2

Applied all, thanks.