Skip to contentSkip to conversation

arm64: dts: Update IOT2050 boards

PATCH Superseded Jan Kiszka 2 participants 9 messages Sep 7, 2021 – Sep 8, 2021

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

v2 cover arm64: dts: Update IOT2050 boards

This enhances the DTs for the IOT2050, primarily by added support for upcoming Production Generation 2 (PG2) and by ordering the MMC devices consistently across variants.

Changes in v2:
- move mmc alias to SoC level
- split up into PG2 preparation and addition patch
- add link to product homepage

Jan

Jan Kiszka (4):
arm64: dts: ti: k3-am65: Flip mmc device ordering
arm64: dts: ti: iot2050: Disable SR2.0-only PRUs
arm64: dts: ti: iot2050: Prepare for adding 2nd-generation boards
arm64: dts: ti: iot2050: Add support for product generation 2 boards

 arch/arm64/boot/dts/ti/Makefile               |  2 +
 .../dts/ti/k3-am65-iot2050-common-pg1.dtsi    | 46 +++++++++++++++
 .../dts/ti/k3-am65-iot2050-common-pg2.dtsi    | 51 +++++++++++++++++
 .../boot/dts/ti/k3-am65-iot2050-common.dtsi   | 11 +---
 arch/arm64/boot/dts/ti/k3-am65.dtsi           |  2 +
 ...ts => k3-am6528-iot2050-basic-common.dtsi} | 12 +---
 .../dts/ti/k3-am6528-iot2050-basic-pg2.dts    | 24 ++++++++
 .../boot/dts/ti/k3-am6528-iot2050-basic.dts   | 56 +++----------------
 ...=> k3-am6548-iot2050-advanced-common.dtsi} |  8 +--
 .../dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 29 ++++++++++
 .../dts/ti/k3-am6548-iot2050-advanced.dts     | 50 +++--------------
 11 files changed, 175 insertions(+), 116 deletions(-)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
 copy arch/arm64/boot/dts/ti/{k3-am6528-iot2050-basic.dts => k3-am6528-iot2050-basic-common.dtsi} (80%)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts
 copy arch/arm64/boot/dts/ti/{k3-am6548-iot2050-advanced.dts => k3-am6548-iot2050-advanced-common.dtsi} (85%)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v2 1/4 arm64: dts: ti: k3-am65: Flip mmc device ordering

From: Jan Kiszka <[email protected]>

This ensures that the SD card will remain mmc0 across devices with and without eMMC.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am65.dtsi +2 -0
index a9fc1af03f27..785d931a2dd9 100644
@@ -31,6 +31,8 @@ aliases {
 		i2c4 = &main_i2c2;
 		i2c5 = &main_i2c3;
 		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci1;
+		mmc1 = &sdhci0;
 	};
 
 	chosen { };
Signature · 1 line
2.31.1
maintainer
#2 lore raw

Re: [PATCH v2 1/4] arm64: dts: ti: k3-am65: Flip mmc device ordering

Quoted 15 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This ensures that the SD card will remain mmc0 across devices with and without eMMC.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
index a9fc1af03f27..785d931a2dd9 100644

arch/arm64/boot/dts/ti/k3-am65.dtsi aliases { · line 35

Quoted 5 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +2 -0
@@ -31,6 +31,8 @@ aliases {
 		i2c4 = &main_i2c2;
 		i2c5 = &main_i2c3;
 		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci1;
+		mmc1 = &sdhci0;

Jan,

Responding in context of [1]. Suggestion from Aswath is to do the following instead at SoC level:
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;

Quoted 6 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
 	};
 
 	chosen { };
Signature · 1 line
2.31.1

[1] https://lore.kernel.org/all/[email protected]/

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
author
#3 lore raw

Re: [PATCH v2 1/4] arm64: dts: ti: k3-am65: Flip mmc device ordering

Quoted 27 lines · Nishanth Menon
Quoted 15 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This ensures that the SD card will remain mmc0 across devices with and without eMMC.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
index a9fc1af03f27..785d931a2dd9 100644

arch/arm64/boot/dts/ti/k3-am65.dtsi aliases { · line 35

Quoted 5 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +2 -0
@@ -31,6 +31,8 @@ aliases {
 		i2c4 = &main_i2c2;
 		i2c5 = &main_i2c3;
 		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci1;
+		mmc1 = &sdhci0;

Jan,

Responding in context of [1]. Suggestion from Aswath is to do the following instead at SoC level:

Review

Quoted 2 lines
(quoted diff) +2 -0
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;

Then I will leave this up to you and will go back to v1 of this patch (as we require it the other way around).

Jan

Quoted 8 lines
Quoted 6 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
 	};
 
 	chosen { };
Signature · 1 line
2.31.1

[1] https://lore.kernel.org/all/[email protected]/

Signature · 2 lines
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
maintainer
#4 lore raw

Re: [PATCH v2 1/4] arm64: dts: ti: k3-am65: Flip mmc device ordering

Quoted 25 lines · Jan Kiszka
Quoted 24 lines · Nishanth Menon
Quoted 15 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This ensures that the SD card will remain mmc0 across devices with and without eMMC.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
index a9fc1af03f27..785d931a2dd9 100644

arch/arm64/boot/dts/ti/k3-am65.dtsi aliases { · line 35

Quoted 5 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +2 -0
@@ -31,6 +31,8 @@ aliases {
 		i2c4 = &main_i2c2;
 		i2c5 = &main_i2c3;
 		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci1;
+		mmc1 = &sdhci0;

Jan,

Quoted 8 lines

Review

Quoted 5 lines

Responding in context of [1]. Suggestion from Aswath is to do the following instead at SoC level:

(quoted diff) +2 -0
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;

Then I will leave this up to you and will go back to v1 of this patch (as we require it the other way around).

Could you elaborate on the rationale as to why the other way around? That would probably provide the reasoning to override the SoC generic definitions in the board dts/dtsi as the exception case.

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
author
#5 lore raw

Re: [PATCH v2 1/4] arm64: dts: ti: k3-am65: Flip mmc device ordering

Quoted 35 lines · Nishanth Menon
Quoted 25 lines · Jan Kiszka
Quoted 24 lines · Nishanth Menon
Quoted 15 lines · Jan Kiszka

From: Jan Kiszka <[email protected]>

This ensures that the SD card will remain mmc0 across devices with and without eMMC.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -0
index a9fc1af03f27..785d931a2dd9 100644

arch/arm64/boot/dts/ti/k3-am65.dtsi aliases { · line 35

Quoted 5 lines
arch/arm64/boot/dts/ti/k3-am65.dtsi +2 -0
@@ -31,6 +31,8 @@ aliases {
 		i2c4 = &main_i2c2;
 		i2c5 = &main_i2c3;
 		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci1;
+		mmc1 = &sdhci0;

Jan,

Quoted 8 lines

Review

Quoted 5 lines

Responding in context of [1]. Suggestion from Aswath is to do the following instead at SoC level:

(quoted diff) +2 -0
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;

Then I will leave this up to you and will go back to v1 of this patch (as we require it the other way around).

Quoted 4 lines

Could you elaborate on the rationale as to why the other way around? That would probably provide the reasoning to override the SoC generic definitions in the board dts/dtsi as the exception case.

As I wrote in v1: We have deployed devices that use mmcblk0 == SD card in the field. Those should now be migrated to upstream kernel/DT, but ideally without glitches in the interface.

Jan

Signature · 2 lines
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
author
#6 lore raw

PATCH v2 2/4 arm64: dts: ti: iot2050: Disable SR2.0-only PRUs

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

The IOT2050 devices described so far are using SR1.0 silicon, thus do not have the additional PRUs of the ICSSG of the SR2.0. Disable them.

---
 .../boot/dts/ti/k3-am65-iot2050-common.dtsi   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi +24 -0
index 1008e9162ba2..63a28e18a3bf 100644
@@ -714,3 +714,27 @@ &icssg1_mdio {
 &icssg2_mdio {
 	status = "disabled";
 };
+
+&tx_pru0_0 {
+	status = "disabled";
+};
+
+&tx_pru0_1 {
+	status = "disabled";
+};
+
+&tx_pru1_0 {
+	status = "disabled";
+};
+
+&tx_pru1_1 {
+	status = "disabled";
+};
+
+&tx_pru2_0 {
+	status = "disabled";
+};
+
+&tx_pru2_1 {
+	status = "disabled";
+};
Signature · 1 line
2.31.1
author
#7 lore raw

PATCH v2 3/4 arm64: dts: ti: iot2050: Prepare for adding 2nd-generation boards

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

The current IOT2050 devices are Product Generation 1 (PG1), using SR1.0 AM65x silicon. Upcoming PG2 devices will use SR2.x SoCs and will therefore need separate device trees. Prepare for that by factoring out common bits that will be shared across both generations.

At this chance, drop a link to the product homepage to in the top-level dts files.

---
 .../dts/ti/k3-am65-iot2050-common-pg1.dtsi    | 46 +++++++++++++++
 .../boot/dts/ti/k3-am65-iot2050-common.dtsi   | 35 +-----------
 ...ts => k3-am6528-iot2050-basic-common.dtsi} | 12 +---
 .../boot/dts/ti/k3-am6528-iot2050-basic.dts   | 56 +++----------------
 ...=> k3-am6548-iot2050-advanced-common.dtsi} |  8 +--
 .../dts/ti/k3-am6548-iot2050-advanced.dts     | 50 +++--------------
 6 files changed, 67 insertions(+), 140 deletions(-)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
 copy arch/arm64/boot/dts/ti/{k3-am6528-iot2050-basic.dts => k3-am6528-iot2050-basic-common.dtsi} (80%)
 copy arch/arm64/boot/dts/ti/{k3-am6548-iot2050-advanced.dts => k3-am6548-iot2050-advanced-common.dtsi} (85%)
arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi new file +46 -0
new file mode 100644
index 000000000000..51f902fa35a7
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) Siemens AG, 2021
+ *
+ * Authors:
+ *   Jan Kiszka <[email protected]>
+ *
+ * Common bits of the IOT2050 Basic and Advanced variants, PG1
+ */
+
+&dss {
+	assigned-clocks = <&k3_clks 67 2>;
+	assigned-clock-parents = <&k3_clks 67 5>;
+};
+
+&serdes0 {
+	status = "disabled";
+};
+
+&sdhci1 {
+	no-1-8-v;
+};
+
+&tx_pru0_0 {
+	status = "disabled";
+};
+
+&tx_pru0_1 {
+	status = "disabled";
+};
+
+&tx_pru1_0 {
+	status = "disabled";
+};
+
+&tx_pru1_1 {
+	status = "disabled";
+};
+
+&tx_pru2_0 {
+	status = "disabled";
+};
+
+&tx_pru2_1 {
+	status = "disabled";
+};
arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi +2 -33
index 63a28e18a3bf..af1e95f0f0ce 100644
@@ -4,13 +4,11 @@
  *
  * Authors:
  *   Le Jin <[email protected]>
- *   Jan Kiszka <[email protected]>
+ *   Jan Kiszka <[email protected]>
  *
- * Common bits of the IOT2050 Basic and Advanced variants
+ * Common bits of the IOT2050 Basic and Advanced variants, PG1 and PG2
  */
 
-/dts-v1/;
-
 #include "k3-am654.dtsi"
 #include <dt-bindings/phy/phy.h>
 
@@ -555,7 +553,6 @@ &sdhci1 {
 	pinctrl-0 = <&main_mmc1_pins_default>;
 	ti,driver-strength-ohm = <50>;
 	disable-wp;
-	no-1-8-v;
 };
 
 &usb0 {
@@ -629,10 +626,6 @@ dpi_out: endpoint {
 	};
 };
 
-&serdes0 {
-	status = "disabled";
-};
-
 &pcie0_rc {
 	status = "disabled";
 };
@@ -714,27 +707,3 @@ &icssg1_mdio {
 &icssg2_mdio {
 	status = "disabled";
 };
-
-&tx_pru0_0 {
-	status = "disabled";
-};
-
-&tx_pru0_1 {
-	status = "disabled";
-};
-
-&tx_pru1_0 {
-	status = "disabled";
-};
-
-&tx_pru1_1 {
-	status = "disabled";
-};
-
-&tx_pru2_0 {
-	status = "disabled";
-};
-
-&tx_pru2_1 {
-	status = "disabled";
-};
arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi renamed from arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts +3 -9
similarity index 80%
copy from arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts
copy to arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
index 94bb5dd39122..4a9bf7d7c07d 100644
@@ -4,20 +4,14 @@
  *
  * Authors:
  *   Le Jin <[email protected]>
- *   Jan Kiszka <[email protected]>
+ *   Jan Kiszka <[email protected]>
  *
- * AM6528-based (dual-core) IOT2050 Basic variant
- * 1 GB RAM, no eMMC, main_uart0 on connector X30
+ * Common bits of the IOT2050 Basic variant, PG1 and PG2
  */
 
-/dts-v1/;
-
 #include "k3-am65-iot2050-common.dtsi"
 
 / {
-	compatible = "siemens,iot2050-basic", "ti,am654";
-	model = "SIMATIC IOT2050 Basic";
-
 	memory@80000000 {
 		device_type = "memory";
 		/* 1G RAM */
@@ -61,6 +55,6 @@ &main_uart0 {
 };
 
 &mcu_r5fss0 {
-	/* lock-step mode not supported on this board */
+	/* lock-step mode not supported on Basic boards */
 	ti,cluster-mode = <0>;
 };
arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts +7 -49

70 lines not on this page · raw message

arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi renamed from arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts +2 -6
similarity index 85%
copy from arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts
copy to arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
index ec9617c13cdb..d25e8b26187f 100644
@@ -4,10 +4,9 @@
  *
  * Authors:
  *   Le Jin <[email protected]>
- *   Jan Kiszka <[email protected]>
+ *   Jan Kiszka <[email protected]>
  *
- * AM6548-based (quad-core) IOT2050 Advanced variant
- * 2 GB RAM, 16 GB eMMC, USB-serial converter on connector X30
+ * Common bits of the IOT2050 Advanced variant, PG1 and PG2
  */
 
 /dts-v1/;
@@ -15,9 +14,6 @@
 #include "k3-am65-iot2050-common.dtsi"
 
 / {
-	compatible = "siemens,iot2050-advanced", "ti,am654";
-	model = "SIMATIC IOT2050 Advanced";
-
 	memory@80000000 {
 		device_type = "memory";
 		/* 2G RAM */
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts +7 -43

64 lines not on this page · raw message

Signature · 1 line
2.31.1
author
#8 lore raw

PATCH v2 4/4 arm64: dts: ti: iot2050: Add support for product generation 2 boards

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This adds the devices trees for IOT2050 Product Generation 2 (PG2) boards. We have Basic and an Advanced variants again, differing in number of cores, RAM size, availability of eMMC and further details. The major difference to PG1 is the used silicon revision (SR2.x on PG2).

---
 arch/arm64/boot/dts/ti/Makefile               |  2 +
 .../dts/ti/k3-am65-iot2050-common-pg2.dtsi    | 51 +++++++++++++++++++
 .../dts/ti/k3-am6528-iot2050-basic-pg2.dts    | 24 +++++++++
 .../dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 29 +++++++++++
 4 files changed, 106 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
 create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts
 create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts
arch/arm64/boot/dts/ti/Makefile +2 -0
index d56c742f5a10..41a4bc96e6bd 100644
@@ -8,7 +8,9 @@
 
 dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb
+dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb
 dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb
+dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb
 
 dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb
 
arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi new file +51 -0

51 lines not on this page · raw message

arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts new file +24 -0
new file mode 100644
index 000000000000..c62549a4b436
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) Siemens AG, 2018-2021
+ *
+ * Authors:
+ *   Le Jin <[email protected]>
+ *   Jan Kiszka <[email protected]>
+ *
+ * AM6528-based (dual-core) IOT2050 Basic variant, Product Generation 2
+ * 1 GB RAM, no eMMC, main_uart0 on connector X30
+ *
+ * Product homepage:
+ * https://new.siemens.com/global/en/products/automation/pc-based/iot-gateways/simatic-iot2050.html
+ */
+
+/dts-v1/;
+
+#include "k3-am6528-iot2050-basic-common.dtsi"
+#include "k3-am65-iot2050-common-pg2.dtsi"
+
+/ {
+	compatible = "siemens,iot2050-basic-pg2", "ti,am654";
+	model = "SIMATIC IOT2050 Basic PG2";
+};
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts new file +29 -0
new file mode 100644
index 000000000000..f00dc86d01b9
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) Siemens AG, 2018-2021
+ *
+ * Authors:
+ *   Le Jin <[email protected]>
+ *   Jan Kiszka <[email protected]>
+ *
+ * AM6548-based (quad-core) IOT2050 Advanced variant, Product Generation 2
+ * 2 GB RAM, 16 GB eMMC, USB-serial converter on connector X30
+ *
+ * Product homepage:
+ * https://new.siemens.com/global/en/products/automation/pc-based/iot-gateways/simatic-iot2050.html
+ */
+
+/dts-v1/;
+
+#include "k3-am6548-iot2050-advanced-common.dtsi"
+#include "k3-am65-iot2050-common-pg2.dtsi"
+
+/ {
+	compatible = "siemens,iot2050-advanced-pg2", "ti,am654";
+	model = "SIMATIC IOT2050 Advanced PG2";
+};
+
+&mcu_r5fss0 {
+	/* lock-step mode not supported on this board */
+	ti,cluster-mode = <0>;
+};
Signature · 1 line
2.31.1