diff mbox series

arm: dts: iot2050: Include u-boot specific bits implicitly

Message ID 8e482943-eb2b-c67a-a7f8-fa202d86b137@siemens.com
State Accepted
Commit fca76cda28b83c863619057903c7fa4085e40767
Delegated to: Tom Rini
Headers show
Series arm: dts: iot2050: Include u-boot specific bits implicitly | expand

Commit Message

Jan Kiszka April 25, 2023, 7:28 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Create *-u-boot.dtsi files for each target dtb of the IOT2050 series so
that we can drop the #include deviations from upstream dts[i] files
here.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

This was tested against most of our boards with the DTS synced from 
kernel 6.3.

 arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi          |  2 --
 arch/arm/dts/k3-am6528-iot2050-basic-common.dtsi      |  3 ---
 arch/arm/dts/k3-am6528-iot2050-basic-pg2-u-boot.dtsi  | 11 +++++++++++
 arch/arm/dts/k3-am6528-iot2050-basic-u-boot.dtsi      | 10 ++++++++++
 arch/arm/dts/k3-am6548-iot2050-advanced-common.dtsi   |  3 ---
 .../arm/dts/k3-am6548-iot2050-advanced-m2-u-boot.dtsi |  1 +
 .../dts/k3-am6548-iot2050-advanced-pg2-u-boot.dtsi    |  1 +
 arch/arm/dts/k3-am6548-iot2050-advanced-u-boot.dtsi   |  1 +
 8 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/dts/k3-am6528-iot2050-basic-pg2-u-boot.dtsi
 create mode 100644 arch/arm/dts/k3-am6528-iot2050-basic-u-boot.dtsi
 create mode 120000 arch/arm/dts/k3-am6548-iot2050-advanced-m2-u-boot.dtsi
 create mode 120000 arch/arm/dts/k3-am6548-iot2050-advanced-pg2-u-boot.dtsi
 create mode 120000 arch/arm/dts/k3-am6548-iot2050-advanced-u-boot.dtsi

Comments

Tom Rini May 5, 2023, 12:59 a.m. UTC | #1 
On Tue, Apr 25, 2023 at 09:28:23PM +0200, Jan Kiszka wrote:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Create *-u-boot.dtsi files for each target dtb of the IOT2050 series so
> that we can drop the #include deviations from upstream dts[i] files
> here.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi b/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi
index e7e0ca41597..e73458ca690 100644
--- a/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi
@@ -49,5 +49,3 @@ 
 	snps,dis-u1-entry-quirk;
 	snps,dis-u2-entry-quirk;
 };
-
-#include "k3-am65-iot2050-common-pg2-u-boot.dtsi"
diff --git a/arch/arm/dts/k3-am6528-iot2050-basic-common.dtsi b/arch/arm/dts/k3-am6528-iot2050-basic-common.dtsi
index 0d215b4d668..4a9bf7d7c07 100644
--- a/arch/arm/dts/k3-am6528-iot2050-basic-common.dtsi
+++ b/arch/arm/dts/k3-am6528-iot2050-basic-common.dtsi
@@ -11,9 +11,6 @@ 
 
 #include "k3-am65-iot2050-common.dtsi"
 
-#include "k3-am65-iot2050-common-u-boot.dtsi"
-#include "k3-am65-iot2050-boot-image.dtsi"
-
 / {
 	memory@80000000 {
 		device_type = "memory";
diff --git a/arch/arm/dts/k3-am6528-iot2050-basic-pg2-u-boot.dtsi b/arch/arm/dts/k3-am6528-iot2050-basic-pg2-u-boot.dtsi
new file mode 100644
index 00000000000..1e393042ac0
--- /dev/null
+++ b/arch/arm/dts/k3-am6528-iot2050-basic-pg2-u-boot.dtsi
@@ -0,0 +1,11 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Authors:
+ *   Jan Kiszka <jan.kiszka@siemens.com>
+ */
+
+#include "k3-am65-iot2050-common-u-boot.dtsi"
+#include "k3-am65-iot2050-common-pg2-u-boot.dtsi"
+#include "k3-am65-iot2050-boot-image.dtsi"
diff --git a/arch/arm/dts/k3-am6528-iot2050-basic-u-boot.dtsi b/arch/arm/dts/k3-am6528-iot2050-basic-u-boot.dtsi
new file mode 100644
index 00000000000..64afe25e38f
--- /dev/null
+++ b/arch/arm/dts/k3-am6528-iot2050-basic-u-boot.dtsi
@@ -0,0 +1,10 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) Siemens AG, 2023
+ *
+ * Authors:
+ *   Jan Kiszka <jan.kiszka@siemens.com>
+ */
+
+#include "k3-am65-iot2050-common-u-boot.dtsi"
+#include "k3-am65-iot2050-boot-image.dtsi"
diff --git a/arch/arm/dts/k3-am6548-iot2050-advanced-common.dtsi b/arch/arm/dts/k3-am6548-iot2050-advanced-common.dtsi
index 816a4cb4a68..d25e8b26187 100644
--- a/arch/arm/dts/k3-am6548-iot2050-advanced-common.dtsi
+++ b/arch/arm/dts/k3-am6548-iot2050-advanced-common.dtsi
@@ -13,9 +13,6 @@ 
 
 #include "k3-am65-iot2050-common.dtsi"
 
-#include "k3-am65-iot2050-common-u-boot.dtsi"
-#include "k3-am65-iot2050-boot-image.dtsi"
-
 / {
 	memory@80000000 {
 		device_type = "memory";
diff --git a/arch/arm/dts/k3-am6548-iot2050-advanced-m2-u-boot.dtsi b/arch/arm/dts/k3-am6548-iot2050-advanced-m2-u-boot.dtsi
new file mode 120000
index 00000000000..859776d3ffe
--- /dev/null
+++ b/arch/arm/dts/k3-am6548-iot2050-advanced-m2-u-boot.dtsi
@@ -0,0 +1 @@ 
+k3-am6528-iot2050-basic-pg2-u-boot.dtsi
\ No newline at end of file
diff --git a/arch/arm/dts/k3-am6548-iot2050-advanced-pg2-u-boot.dtsi b/arch/arm/dts/k3-am6548-iot2050-advanced-pg2-u-boot.dtsi
new file mode 120000
index 00000000000..859776d3ffe
--- /dev/null
+++ b/arch/arm/dts/k3-am6548-iot2050-advanced-pg2-u-boot.dtsi
@@ -0,0 +1 @@ 
+k3-am6528-iot2050-basic-pg2-u-boot.dtsi
\ No newline at end of file
diff --git a/arch/arm/dts/k3-am6548-iot2050-advanced-u-boot.dtsi b/arch/arm/dts/k3-am6548-iot2050-advanced-u-boot.dtsi
new file mode 120000
index 00000000000..ac30e4ef46e
--- /dev/null
+++ b/arch/arm/dts/k3-am6548-iot2050-advanced-u-boot.dtsi
@@ -0,0 +1 @@ 
+k3-am6528-iot2050-basic-u-boot.dtsi
\ No newline at end of file