Skip to contentSkip to conversation

arm: dts: keystone: Move to OF_UPSTREAM

PATCH In review Andrew Davis 3 participants 3 messages Aug 7, 2024 – Aug 15, 2024 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: dts: keystone: Move to OF_UPSTREAM

Enable OF_UPSTREAM for Keystone boards. Remove DT files that are now available in dts/upstream.

---
 arch/arm/dts/Makefile                         |   7 -
 arch/arm/dts/keystone-clocks.dtsi             | 411 -----------------
 arch/arm/dts/keystone-k2e-clocks.dtsi         |  74 ---
 arch/arm/dts/keystone-k2e-evm-u-boot.dtsi     |  14 +-
 arch/arm/dts/keystone-k2e-evm.dts             | 152 -------
 arch/arm/dts/keystone-k2e-netcp.dtsi          | 203 ---------
 arch/arm/dts/keystone-k2e.dtsi                | 144 ------
 arch/arm/dts/keystone-k2g-evm-u-boot.dtsi     |  20 +-
 arch/arm/dts/keystone-k2g-evm.dts             | 148 ------
 arch/arm/dts/keystone-k2g-generic-u-boot.dtsi |  18 -
 arch/arm/dts/keystone-k2g-generic.dts         |  27 --
 arch/arm/dts/keystone-k2g-ice-u-boot.dtsi     |  15 +-
 arch/arm/dts/keystone-k2g-ice.dts             | 118 -----
 arch/arm/dts/keystone-k2g-netcp.dtsi          | 149 -------
 arch/arm/dts/keystone-k2g.dtsi                | 258 -----------
 arch/arm/dts/keystone-k2hk-clocks.dtsi        | 422 ------------------
 arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi    |  26 +-
 arch/arm/dts/keystone-k2hk-evm.dts            | 180 --------
 arch/arm/dts/keystone-k2hk-netcp.dtsi         | 207 ---------
 arch/arm/dts/keystone-k2hk.dtsi               | 111 -----
 arch/arm/dts/keystone-k2l-clocks.dtsi         | 263 -----------
 arch/arm/dts/keystone-k2l-evm-u-boot.dtsi     |  28 +-
 arch/arm/dts/keystone-k2l-evm.dts             | 129 ------
 arch/arm/dts/keystone-k2l-netcp.dtsi          | 187 --------
 arch/arm/dts/keystone-k2l.dtsi                | 105 -----
 arch/arm/dts/keystone.dtsi                    | 330 --------------
 configs/k2e_evm_defconfig                     |   3 +-
 configs/k2e_hs_evm_defconfig                  |   3 +-
 configs/k2g_evm_defconfig                     |   5 +-
 configs/k2g_hs_evm_defconfig                  |   5 +-
 configs/k2hk_evm_defconfig                    |   3 +-
 configs/k2hk_hs_evm_defconfig                 |   3 +-
 configs/k2l_evm_defconfig                     |   3 +-
 configs/k2l_hs_evm_defconfig                  |   3 +-
 34 files changed, 98 insertions(+), 3676 deletions(-)
 delete mode 100644 arch/arm/dts/keystone-clocks.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2e-clocks.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2e-evm.dts
 delete mode 100644 arch/arm/dts/keystone-k2e-netcp.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2e.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2g-evm.dts
 delete mode 100644 arch/arm/dts/keystone-k2g-generic-u-boot.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2g-generic.dts
 delete mode 100644 arch/arm/dts/keystone-k2g-ice.dts
 delete mode 100644 arch/arm/dts/keystone-k2g-netcp.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2g.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2hk-clocks.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2hk-evm.dts
 delete mode 100644 arch/arm/dts/keystone-k2hk-netcp.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2hk.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2l-clocks.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2l-evm.dts
 delete mode 100644 arch/arm/dts/keystone-k2l-netcp.dtsi
 delete mode 100644 arch/arm/dts/keystone-k2l.dtsi
 delete mode 100644 arch/arm/dts/keystone.dtsi
arch/arm/dts/Makefile +0 -7
index 82d37adae3f..2c983b2224c 100644
@@ -953,13 +953,6 @@ endif
 dtb-$(CONFIG_RZA1) += \
 	r7s72100-gr-peach.dtb
 
-dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \
-	keystone-k2l-evm.dtb \
-	keystone-k2e-evm.dtb \
-	keystone-k2g-evm.dtb \
-	keystone-k2g-generic.dtb \
-	keystone-k2g-ice.dtb
-
 dtb-$(CONFIG_TARGET_AT91SAM9261EK) += at91sam9261ek.dtb
 
 dtb-$(CONFIG_TARGET_PM9261) += at91sam9261ek.dtb
arch/arm/dts/keystone-clocks.dtsi deleted +0 -411

411 lines not on this page · raw message

arch/arm/dts/keystone-k2e-clocks.dtsi deleted +0 -74

74 lines not on this page · raw message

arch/arm/dts/keystone-k2e-evm-u-boot.dtsi +11 -3
index 953c7502260..e77c53dbf7b 100644
@@ -4,15 +4,23 @@
  */
 
 /{
-	soc {
-		bootph-all;
-	};
 	aliases {
 		usb0 = &usb;
 		usb1 = &usb1;
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
+	};
+
+	chosen {
+		stdout-path = &uart0;
 	};
 };
 
+&soc0 {
+	bootph-all;
+};
+
 &i2c1 {
 	bootph-all;
 };
arch/arm/dts/keystone-k2e-evm.dts deleted +0 -152

152 lines not on this page · raw message

arch/arm/dts/keystone-k2e-netcp.dtsi deleted +0 -203

203 lines not on this page · raw message

arch/arm/dts/keystone-k2e.dtsi deleted +0 -144

144 lines not on this page · raw message

arch/arm/dts/keystone-k2g-evm-u-boot.dtsi +17 -3
index 72b67b232dd..19c78c97ae3 100644
@@ -4,20 +4,34 @@
  */
 
 /{
-	soc {
-		bootph-all;
-	};
 	aliases {
 		usb0 = &usb0;
 		usb1 = &usb1;
 	};
+
+	chosen {
+		stdout-path = &uart0;
+	};
+};
+
+&soc0 {
+	bootph-all;
+
+	pmmc@2900000 {
+		bootph-all;
+		compatible = "ti,power-processor";
+		reg = <0x02900000 0x40000>;
+		ti,lpsc_module = <1>;
+	};
 };
 
 &i2c0 {
+	status = "okay";
 	bootph-all;
 };
 
 &i2c1 {
+	status = "okay";
 	bootph-all;
 };
 
arch/arm/dts/keystone-k2g-evm.dts deleted +0 -148

148 lines not on this page · raw message

arch/arm/dts/keystone-k2g-generic-u-boot.dtsi deleted +0 -18
deleted file mode 100644
index 3634ed7268c..00000000000
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-/{
-	soc {
-		bootph-all;
-	};
-};
-
-&i2c0 {
-	bootph-all;
-};
-
-&i2c1 {
-	bootph-all;
-};
arch/arm/dts/keystone-k2g-generic.dts deleted +0 -27
deleted file mode 100644
index dc6c31a31b4..00000000000
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Device Tree Source for Generic 66AK2G0X EVM
- *
- * Copyright (C) 2017 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-/dts-v1/;
-
-#include "keystone-k2g.dtsi"
-
-/ {
-	compatible = "ti,k2g-generic", "ti,k2g", "ti,keystone";
-	model = "Texas Instruments 66AK2G02 Generic";
-
-	chosen {
-		stdout-path = &uart0;
-	};
-};
-
-&i2c0 {
-        status = "okay";
-};
-
-&i2c1 {
-        status = "okay";
-};
arch/arm/dts/keystone-k2g-ice-u-boot.dtsi +14 -1
index 3634ed7268c..152744686b5 100644
@@ -4,15 +4,28 @@
  */
 
 /{
-	soc {
+	chosen {
+		stdout-path = &uart0;
+	};
+};
+
+&soc0 {
+	bootph-all;
+
+	pmmc@2900000 {
 		bootph-all;
+		compatible = "ti,power-processor";
+		reg = <0x02900000 0x40000>;
+		ti,lpsc_module = <1>;
 	};
 };
 
 &i2c0 {
+	status = "okay";
 	bootph-all;
 };
 
 &i2c1 {
+	status = "okay";
 	bootph-all;
 };
arch/arm/dts/keystone-k2g-ice.dts deleted +0 -118

118 lines not on this page · raw message

arch/arm/dts/keystone-k2g-netcp.dtsi deleted +0 -149

149 lines not on this page · raw message

arch/arm/dts/keystone-k2g.dtsi deleted +0 -258

258 lines not on this page · raw message

arch/arm/dts/keystone-k2hk-clocks.dtsi deleted +0 -422

422 lines not on this page · raw message

arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi +17 -9
index 3e38f228a6a..3b3d327562c 100644
@@ -4,9 +4,19 @@
  */
 
 /{
-	soc {
-		bootph-all;
+	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c2 = &i2c2;
 	};
+
+	chosen {
+		stdout-path = &uart0;
+	};
+};
+
+&soc0 {
+	bootph-all;
 };
 
 &i2c1 {
@@ -18,11 +28,9 @@
 	psc-domain = <2>;
 };
 
-&usb {
-	dwc3@2690000 {
-		phys = <&usb_phy>;
-		dr_mode = "host";
-		snps,u2ss_inp3_quirk;
-		status = "okay";
-	};
+&usb0 {
+	phys = <&usb_phy>;
+	dr_mode = "host";
+	snps,u2ss_inp3_quirk;
+	status = "okay";
 };
arch/arm/dts/keystone-k2hk-evm.dts deleted +0 -180

180 lines not on this page · raw message

arch/arm/dts/keystone-k2hk-netcp.dtsi deleted +0 -207

207 lines not on this page · raw message

arch/arm/dts/keystone-k2hk.dtsi deleted +0 -111

111 lines not on this page · raw message

arch/arm/dts/keystone-k2l-clocks.dtsi deleted +0 -263

236 lines not on this page · raw message

arch/arm/dts/keystone-k2l-evm-u-boot.dtsi +21 -7
index f1aed14b0b5..d9dee805ebe 100644

Lines of this file are not shown. View the raw message.

arch/arm/dts/keystone-k2l-evm.dts deleted +0 -129

129 lines not on this page · raw message

arch/arm/dts/keystone-k2l-netcp.dtsi deleted +0 -187

187 lines not on this page · raw message

arch/arm/dts/keystone-k2l.dtsi deleted +0 -105

105 lines not on this page · raw message

arch/arm/dts/keystone.dtsi deleted +0 -330

330 lines not on this page · raw message

configs/k2e_evm_defconfig +2 -1
index 8d6cb240446..f201a175727 100644

Lines of this file are not shown. View the raw message.

configs/k2e_hs_evm_defconfig +2 -1
index e3c0ae15071..46501d59e09 100644

Lines of this file are not shown. View the raw message.

configs/k2g_evm_defconfig +3 -2
index 5d54d75f974..57a3d362a1b 100644

Lines of this file are not shown. View the raw message.

configs/k2g_hs_evm_defconfig +3 -2
index 9adab3af305..392ec5b2a05 100644

Lines of this file are not shown. View the raw message.

configs/k2hk_evm_defconfig +2 -1
index 4da75d1ca76..2e29b2f2aeb 100644

Lines of this file are not shown. View the raw message.

configs/k2hk_hs_evm_defconfig +2 -1
index 1a24d7142b8..cf299f2457c 100644

Lines of this file are not shown. View the raw message.

configs/k2l_evm_defconfig +2 -1
index c4534f033ac..0cadece4b02 100644

Lines of this file are not shown. View the raw message.

configs/k2l_hs_evm_defconfig +2 -1
index c874349e942..5496049d3a3 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.39.2

Part of the diff is not shown here. View the raw message.

Acked-by on v1 1/1
#1 lore raw

Hi Andrew

Quoted 52 lines · Andrew Davis

Enable OF_UPSTREAM for Keystone boards. Remove DT files that are now available in dts/upstream.

---
  arch/arm/dts/Makefile                         |   7 -
  arch/arm/dts/keystone-clocks.dtsi             | 411 -----------------
  arch/arm/dts/keystone-k2e-clocks.dtsi         |  74 ---
  arch/arm/dts/keystone-k2e-evm-u-boot.dtsi     |  14 +-
  arch/arm/dts/keystone-k2e-evm.dts             | 152 -------
  arch/arm/dts/keystone-k2e-netcp.dtsi          | 203 ---------
  arch/arm/dts/keystone-k2e.dtsi                | 144 ------
  arch/arm/dts/keystone-k2g-evm-u-boot.dtsi     |  20 +-
  arch/arm/dts/keystone-k2g-evm.dts             | 148 ------
  arch/arm/dts/keystone-k2g-generic-u-boot.dtsi |  18 -
  arch/arm/dts/keystone-k2g-generic.dts         |  27 --
  arch/arm/dts/keystone-k2g-ice-u-boot.dtsi     |  15 +-
  arch/arm/dts/keystone-k2g-ice.dts             | 118 -----
  arch/arm/dts/keystone-k2g-netcp.dtsi          | 149 -------
  arch/arm/dts/keystone-k2g.dtsi                | 258 -----------
  arch/arm/dts/keystone-k2hk-clocks.dtsi        | 422 ------------------
  arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi    |  26 +-
  arch/arm/dts/keystone-k2hk-evm.dts            | 180 --------
  arch/arm/dts/keystone-k2hk-netcp.dtsi         | 207 ---------
  arch/arm/dts/keystone-k2hk.dtsi               | 111 -----
  arch/arm/dts/keystone-k2l-clocks.dtsi         | 263 -----------
  arch/arm/dts/keystone-k2l-evm-u-boot.dtsi     |  28 +-
  arch/arm/dts/keystone-k2l-evm.dts             | 129 ------
  arch/arm/dts/keystone-k2l-netcp.dtsi          | 187 --------
  arch/arm/dts/keystone-k2l.dtsi                | 105 -----
  arch/arm/dts/keystone.dtsi                    | 330 --------------
  configs/k2e_evm_defconfig                     |   3 +-
  configs/k2e_hs_evm_defconfig                  |   3 +-
  configs/k2g_evm_defconfig                     |   5 +-
  configs/k2g_hs_evm_defconfig                  |   5 +-
  configs/k2hk_evm_defconfig                    |   3 +-
  configs/k2hk_hs_evm_defconfig                 |   3 +-
  configs/k2l_evm_defconfig                     |   3 +-
  configs/k2l_hs_evm_defconfig                  |   3 +-
  34 files changed, 98 insertions(+), 3676 deletions(-)

delete mode 100644 arch/arm/dts/keystone-clocks.dtsi delete mode 100644 arch/arm/dts/keystone-k2e-clocks.dtsi delete mode 100644 arch/arm/dts/keystone-k2e-evm.dts delete mode 100644 arch/arm/dts/keystone-k2e-netcp.dtsi delete mode 100644 arch/arm/dts/keystone-k2e.dtsi delete mode 100644 arch/arm/dts/keystone-k2g-evm.dts delete mode 100644 arch/arm/dts/keystone-k2g-generic-u-boot.dtsi delete mode 100644 arch/arm/dts/keystone-k2g-generic.dts delete mode 100644 arch/arm/dts/keystone-k2g-ice.dts delete mode 100644 arch/arm/dts/keystone-k2g-netcp.dtsi delete mode 100644 arch/arm/dts/keystone-k2g.dtsi delete mode 100644 arch/arm/dts/keystone-k2hk-clocks.dtsi

Quoted 8 lines

delete mode 100644 arch/arm/dts/keystone-k2hk-evm.dts delete mode 100644 arch/arm/dts/keystone-k2hk-netcp.dtsi delete mode 100644 arch/arm/dts/keystone-k2hk.dtsi delete mode 100644 arch/arm/dts/keystone-k2l-clocks.dtsi delete mode 100644 arch/arm/dts/keystone-k2l-evm.dts delete mode 100644 arch/arm/dts/keystone-k2l-netcp.dtsi delete mode 100644 arch/arm/dts/keystone-k2l.dtsi delete mode 100644 arch/arm/dts/keystone.dtsi

Signature · 2 lines
Thanking You
Neha Malcom Francis
#2 lore raw
In reply to Andrew Davis
Quoted 4 lines · Andrew Davis

Enable OF_UPSTREAM for Keystone boards. Remove DT files that are now available in dts/upstream.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom