Skip to contentSkip to conversation

arm: dts; am625_beagleplay: Switch to OF_UPSTREAM

PATCH In review Nishanth Menon 1 participant 2 messages Jun 4, 2024 – Jun 5, 2024 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: dts; am625_beagleplay: Switch to OF_UPSTREAM

Enable OF_UPSTREAM for AM625-beagleplay board. Remove DT files that are now available in dts/upstream. Update the appended files based on version of latest OF_UPSTREAM sync point (v6.10-rc1).

---

Based off u-boot
next 15d0dcc0ec1f Merge tag 'u-boot-imx-next-20240603' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next

bootph properties are in sync, so nothing much to do there.

 arch/arm/dts/Makefile                        |   1 -
 arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi |   4 +-
 arch/arm/dts/k3-am625-beagleplay.dts         | 932 -------------------
 configs/am62x_beagleplay_a53_defconfig       |   3 +-
 4 files changed, 4 insertions(+), 936 deletions(-)
 delete mode 100644 arch/arm/dts/k3-am625-beagleplay.dts
arch/arm/dts/Makefile +0 -1
index cd7fcb3a3e6d..8461c70ff093 100644
@@ -1207,7 +1207,6 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-r5-evm.dtb \
 
 dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \
 			      k3-am625-r5-sk.dtb \
-			      k3-am625-beagleplay.dtb \
 			      k3-am625-r5-beagleplay.dtb \
 			      k3-am625-verdin-r5.dtb \
 			      k3-am625-r5-phycore-som-2gb.dtb
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +2 -2
index 9ac4a825f841..dd5b335ed2ee 100644
@@ -66,9 +66,9 @@
 #ifdef CONFIG_TARGET_AM625_A53_BEAGLEPLAY
 
 #define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
-#define SPL_AM625_BEAGLEPLAY_DTB "spl/dts/k3-am625-beagleplay.dtb"
+#define SPL_AM625_BEAGLEPLAY_DTB "spl/dts/ti/k3-am625-beagleplay.dtb"
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM625_BEAGLEPLAY_DTB "arch/arm/dts/k3-am625-beagleplay.dtb"
+#define AM625_BEAGLEPLAY_DTB "dts/upstream/src/arm64/ti/k3-am625-beagleplay.dtb"
 
 &binman {
 	ti-dm {
arch/arm/dts/k3-am625-beagleplay.dts deleted +0 -932

932 lines not on this page · raw message

configs/am62x_beagleplay_a53_defconfig +2 -1
index ec62670d55d6..455dd86b2fc3 100644
@@ -10,7 +10,7 @@ CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="k3-am625-beagleplay"
+CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am625-beagleplay"
 CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DM_RESET=y
@@ -58,6 +58,7 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT=y
 CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y

base-commit: 15d0dcc0ec1f424199dff2a3cbe037bc3a7d8749

Signature · 1 line
2.43.0
#1 lore raw
Quoted 10 lines · Nishanth Menon

Enable OF_UPSTREAM for AM625-beagleplay board. Remove DT files that are now available in dts/upstream. Update the appended files based on version of latest OF_UPSTREAM sync point (v6.10-rc1).

---

Based off u-boot
next 15d0dcc0ec1f Merge tag 'u-boot-imx-next-20240603' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next

Doing a bit more cleanup since I got a few mins to do it.. will resubmit this patch as part of a series.

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