* [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS
2020-02-25 17:57 [PATCH 0/3] arm64: dts: ls1028a: various sl28 fixes/updates Michael Walle
@ 2020-02-25 17:57 ` Michael Walle
2020-03-11 7:16 ` Shawn Guo
2020-02-25 17:57 ` [PATCH 2/3] arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS Michael Walle
2020-02-25 17:57 ` [PATCH 3/3] arm64: dts: ls1028a: sl28: add support for variant 2 Michael Walle
2 siblings, 1 reply; 6+ messages in thread
From: Michael Walle @ 2020-02-25 17:57 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-arm-kernel
Cc: Shawn Guo, Rob Herring, Mark Rutland, Li Yang, 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.
Signed-off-by: Michael Walle <michael@walle.cc>
---
.../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(-)
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 aaf3c04771c3..32f6c80414bc 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
@@ -18,10 +18,10 @@
"kontron,sl28", "fsl,ls1028a";
};
-&i2c4 {
- eeprom@50 {
+&i2c3 {
+ eeprom@57 {
compatible = "atmel,24c32";
- reg = <0x50>;
+ reg = <0x57>;
pagesize = <32>;
};
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
index 20fd86746f94..ff4a43986290 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
@@ -80,6 +80,14 @@
};
};
+&i2c3 {
+ eeprom@57 {
+ compatible = "atmel,24c64";
+ reg = <0x57>;
+ pagesize = <32>;
+ };
+};
+
&i2c4 {
status = "okay";
@@ -92,12 +100,6 @@
assigned-clocks = <&mclk>;
assigned-clock-rates = <1250000>;
};
-
- eeprom@50 {
- compatible = "atmel,24c32";
- reg = <0x50>;
- pagesize = <32>;
- };
};
&sai5 {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index c60a444ad09d..4ba6aae45ef1 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -181,6 +181,12 @@
&i2c4 {
status = "okay";
+
+ eeprom@50 {
+ compatible = "atmel,24c32";
+ reg = <0x50>;
+ pagesize = <32>;
+ };
};
&lpuart1 {
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS
2020-02-25 17:57 ` [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS Michael Walle
@ 2020-03-11 7:16 ` Shawn Guo
2020-03-11 7:28 ` Michael Walle
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2020-03-11 7:16 UTC (permalink / raw)
To: Michael Walle
Cc: devicetree, linux-kernel, linux-arm-kernel, Rob Herring,
Mark Rutland, Li Yang
On Tue, Feb 25, 2020 at 06:57:54PM +0100, Michael Walle wrote:
> 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.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
Doesn't apply to my branch.
Shawn
> ---
> .../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(-)
>
> 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 aaf3c04771c3..32f6c80414bc 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
> @@ -18,10 +18,10 @@
> "kontron,sl28", "fsl,ls1028a";
> };
>
> -&i2c4 {
> - eeprom@50 {
> +&i2c3 {
> + eeprom@57 {
> compatible = "atmel,24c32";
> - reg = <0x50>;
> + reg = <0x57>;
> pagesize = <32>;
> };
> };
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
> index 20fd86746f94..ff4a43986290 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
> @@ -80,6 +80,14 @@
> };
> };
>
> +&i2c3 {
> + eeprom@57 {
> + compatible = "atmel,24c64";
> + reg = <0x57>;
> + pagesize = <32>;
> + };
> +};
> +
> &i2c4 {
> status = "okay";
>
> @@ -92,12 +100,6 @@
> assigned-clocks = <&mclk>;
> assigned-clock-rates = <1250000>;
> };
> -
> - eeprom@50 {
> - compatible = "atmel,24c32";
> - reg = <0x50>;
> - pagesize = <32>;
> - };
> };
>
> &sai5 {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
> index c60a444ad09d..4ba6aae45ef1 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
> @@ -181,6 +181,12 @@
>
> &i2c4 {
> status = "okay";
> +
> + eeprom@50 {
> + compatible = "atmel,24c32";
> + reg = <0x50>;
> + pagesize = <32>;
> + };
> };
>
> &lpuart1 {
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS
2020-03-11 7:16 ` Shawn Guo
@ 2020-03-11 7:28 ` Michael Walle
0 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2020-03-11 7:28 UTC (permalink / raw)
To: Shawn Guo
Cc: devicetree, linux-kernel, linux-arm-kernel, Rob Herring,
Mark Rutland, Li Yang
Am 2020-03-11 08:16, schrieb Shawn Guo:
> On Tue, Feb 25, 2020 at 06:57:54PM +0100, Michael Walle wrote:
>> 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.
>>
>> Signed-off-by: Michael Walle <michael@walle.cc>
>
> Doesn't apply to my branch.
Oh, sorry. there was a patch missing. I'll send a v2 shortly.
-michael
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS
2020-02-25 17:57 [PATCH 0/3] arm64: dts: ls1028a: various sl28 fixes/updates Michael Walle
2020-02-25 17:57 ` [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS Michael Walle
@ 2020-02-25 17:57 ` Michael Walle
2020-02-25 17:57 ` [PATCH 3/3] arm64: dts: ls1028a: sl28: add support for variant 2 Michael Walle
2 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2020-02-25 17:57 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-arm-kernel
Cc: Shawn Guo, Rob Herring, Mark Rutland, Li Yang, 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.
Signed-off-by: Michael Walle <michael@walle.cc>
---
.../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 60 +++++++++++++++++++
1 file changed, 60 insertions(+)
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 32f6c80414bc..4e30558485b0 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
@@ -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";
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] arm64: dts: ls1028a: sl28: add support for variant 2
2020-02-25 17:57 [PATCH 0/3] arm64: dts: ls1028a: various sl28 fixes/updates Michael Walle
2020-02-25 17:57 ` [PATCH 1/3] arm64: dts: ls1028a: sl28: fix on-board EEPROMS Michael Walle
2020-02-25 17:57 ` [PATCH 2/3] arm64: dts: ls1028a: sl28: expose switch ports in KBox A-230-LS Michael Walle
@ 2020-02-25 17:57 ` Michael Walle
2 siblings, 0 replies; 6+ messages in thread
From: Michael Walle @ 2020-02-25 17:57 UTC (permalink / raw)
To: devicetree, linux-kernel, linux-arm-kernel
Cc: Shawn Guo, Rob Herring, Mark Rutland, Li Yang, 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.
Signed-off-by: Michael Walle <michael@walle.cc>
---
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
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 0d36c6e64574..c04bfa72d83e 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -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
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
new file mode 100644
index 000000000000..0a34ff682027
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Device Tree file for the Kontron SMARC-sAL28 board.
+ *
+ * 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 <michael@walle.cc>
+ *
+ */
+
+/dts-v1/;
+#include "fsl-ls1028a-kontron-sl28.dts"
+
+/ {
+ model = "Kontron SMARC-sAL28 (TSN-on-module)";
+ compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a";
+};
+
+&enetc_mdio_pf3 {
+ phy0: ethernet-phy@5 {
+ reg = <0x5>;
+ eee-broken-1000t;
+ eee-broken-100tx;
+ };
+
+ phy1: ethernet-phy@4 {
+ reg = <0x4>;
+ eee-broken-1000t;
+ eee-broken-100tx;
+ };
+};
+
+&enetc_port0 {
+ status = "disabled";
+ /*
+ * In the base device tree the PHY was registered in the mdio
+ * subnode as it is PHY for this port. On this module this PHY
+ * is connected to a switch port instead and registered above.
+ * Therefore, delete the mdio subnode as well as the phy-handle
+ * property here.
+ */
+ /delete-property/ phy-handle;
+ /delete-node/ mdio;
+};
+
+&enetc_port2 {
+ 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 = <&enetc_port2>;
+ status = "okay";
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread