From aab3c35a57697351ca63408ebde7e3139e48cf4f Mon Sep 17 00:00:00 2001 From: Heinrich Toews Date: Wed, 13 May 2026 18:15:53 +0200 Subject: [PATCH] arm64: dts: ti: Extract WAGO board components to overlays last working U-Boot@PFC-750-840x:/ setenv boot_conf "conf-750-8400#overlay-750-8400-wosm-p0000042#overlay-750-8400-base-p0000017#overlay-750-8400-localbus-p0000007#overlay-750-8400-interaction-p0000031" U-Boot@PFC-750-840x:/ setenv fdt_high U-Boot@PFC-750-840x:/ setenv bootm_size 0x10000000 U-Boot@PFC-750-840x:/ ext4load mmc 1:2 ${loadaddr} /boot/fitImage 23880192 bytes read in 1048 ms (21.7 MiB/s) U-Boot@PFC-750-840x:/ setenv bootargs "console=ttyS2,115200 root=/dev/mmcblk0p2 rw rootwait" U-Boot@PFC-750-840x:/ bootm ${loadaddr}#${boot_conf} Signed-off-by: Heinrich Toews --- arch/arm64/boot/dts/ti/Makefile | 5 + arch/arm64/boot/dts/ti/fitImage.its | 100 ++++++++++++++++++ .../boot/dts/ti/k3-am623-pfc-750-8400.dts | 16 ++- .../dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi | 9 +- .../ti/overlay-750-8400-base-p0000017.dtso | 9 ++ ...overlay-750-8400-interaction-p0000031.dtso | 9 ++ .../overlay-750-8400-localbus-p0000007.dtso | 9 ++ .../ti/overlay-750-8400-wosm-p0000042.dtso | 9 ++ 8 files changed, 154 insertions(+), 12 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/fitImage.its create mode 100644 arch/arm64/boot/dts/ti/overlay-750-8400-base-p0000017.dtso create mode 100644 arch/arm64/boot/dts/ti/overlay-750-8400-interaction-p0000031.dtso create mode 100644 arch/arm64/boot/dts/ti/overlay-750-8400-localbus-p0000007.dtso create mode 100644 arch/arm64/boot/dts/ti/overlay-750-8400-wosm-p0000042.dtso diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile index edc03fcf9b8c..30ca8612ef8f 100644 --- a/arch/arm64/boot/dts/ti/Makefile +++ b/arch/arm64/boot/dts/ti/Makefile @@ -26,6 +26,10 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-hdmi-audio.dtb dtb-$(CONFIG_ARCH_K3) += k3-am623-pfc-750-8302.dtb dtb-$(CONFIG_ARCH_K3) += k3-am623-pfc-750-830x-ems.dtb dtb-$(CONFIG_ARCH_K3) += k3-am623-pfc-750-8400.dtb +dtb-$(CONFIG_ARCH_K3) += overlay-750-8400-wosm-p0000042.dtbo \ + overlay-750-8400-base-p0000017.dtbo \ + overlay-750-8400-localbus-p0000007.dtbo \ + overlay-750-8400-interaction-p0000031.dtbo # Boards with AM62Ax SoC dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb @@ -86,3 +90,4 @@ DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@ DTC_FLAGS_k3-j721e-common-proc-board += -@ DTC_FLAGS_k3-j721s2-common-proc-board += -@ DTC_FLAGS_k3-am623-pfc-750-8302 += -@ +DTC_FLAGS_k3-am623-pfc-750-8400 += -@ diff --git a/arch/arm64/boot/dts/ti/fitImage.its b/arch/arm64/boot/dts/ti/fitImage.its new file mode 100644 index 000000000000..2c7e04a4f23f --- /dev/null +++ b/arch/arm64/boot/dts/ti/fitImage.its @@ -0,0 +1,100 @@ +/dts-v1/; + +/ { + description = "WAGO AM623 PFC FIT Image"; + #address-cells = <1>; + + images { + kernel { + description = "Linux Kernel"; + data = /incbin/("../../Image"); + type = "kernel"; + arch = "arm64"; + os = "linux"; + compression = "none"; + load = <0x80080000>; + entry = <0x80080000>; + hash-1 { + algo = "sha256"; + }; + }; + + fdt-750-8400 { + description = "Flattened Device Tree blob"; + data = /incbin/("k3-am623-pfc-750-8400.dtb"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + load = <0x88000000>; + + hash-1 { + algo = "sha256"; + }; + }; + + img-overlay-750-8400-wosm-p0000042 { + description = "WOSM Overlay"; + data = /incbin/("overlay-750-8400-wosm-p0000042.dtbo"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + + }; + + img-overlay-750-8400-base-p0000017 { + description = "Base Overlay"; + data = /incbin/("overlay-750-8400-base-p0000017.dtbo"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + + }; + + img-overlay-750-8400-localbus-p0000007 { + description = "Localbus Overlay"; + data = /incbin/("overlay-750-8400-localbus-p0000007.dtbo"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + + }; + + img-overlay-750-8400-interaction-p0000031 { + description = "Interaction Overlay"; + data = /incbin/("overlay-750-8400-interaction-p0000031.dtbo"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + + }; + }; + + configurations { + default = "conf-750-8400"; + conf-750-8400 { + description = "Boot Linux kernel with base FDT and overlays"; + kernel = "kernel"; + fdt = "fdt-750-8400"; + }; + + overlay-750-8400-wosm-p0000042 { + description = "WOSM Overlay config"; + fdt = "img-overlay-750-8400-wosm-p0000042"; + }; + + overlay-750-8400-base-p0000017 { + description = "Base Overlay config"; + fdt = "img-overlay-750-8400-base-p0000017"; + }; + + overlay-750-8400-localbus-p0000007 { + description = "Localbus Overlay config"; + fdt = "img-overlay-750-8400-localbus-p0000007"; + }; + + overlay-750-8400-interaction-p0000031 { + description = "Interaction Overlay config"; + fdt = "img-overlay-750-8400-interaction-p0000031"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/ti/k3-am623-pfc-750-8400.dts b/arch/arm64/boot/dts/ti/k3-am623-pfc-750-8400.dts index 8581fa398fb3..228c4311dab0 100644 --- a/arch/arm64/boot/dts/ti/k3-am623-pfc-750-8400.dts +++ b/arch/arm64/boot/dts/ti/k3-am623-pfc-750-8400.dts @@ -6,14 +6,22 @@ * Copyright (C) 2025 WAGO GmbH & Co. KG - https://www.wago.com/ */ -#include "k3-am623-pfc-750-84xx-wosm.dtsi" -#include "k3-am623-pfc-750-84xx-baseboard.dtsi" -#include "k3-am623-pfc-750-84xx-kbus.dtsi" -#include "k3-am623-pfc-750-84xx-interaction.dtsi" + + +/dts-v1/; + +#include "k3-am623-pfc-750-8xxx-common.dtsi" +#include "k3-am623-pfc-tpm.dtsi" / { compatible = "wago,am623-pfc-750_8400-100d", "wago,am623-pfc", "ti,am625"; model = "PFC400-750-8400"; + + aliases { + usb1 = &usb1; + ethernet0 = &cpsw_port2; + ethernet1 = &cpsw_port1; + }; }; &wsysinit { diff --git a/arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi b/arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi index f99f3c884c2f..aa3a3051d5d7 100644 --- a/arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am623-pfc-750-84xx-wosm.dtsi @@ -6,18 +6,11 @@ * Copyright (C) 2025 WAGO GmbH & Co. KG - https://www.wago.com/ */ -#include "k3-am623-pfc-750-8xxx-common.dtsi" -#include "k3-am623-pfc-tpm.dtsi" + / { compatible = "ti,am623-pfc", "ti,am625"; - aliases { - usb1 = &usb1; - ethernet0 = &cpsw_port2; - ethernet1 = &cpsw_port1; - }; - cpus { cpu@0 { cpu-supply = <&buck1_30_reg>; diff --git a/arch/arm64/boot/dts/ti/overlay-750-8400-base-p0000017.dtso b/arch/arm64/boot/dts/ti/overlay-750-8400-base-p0000017.dtso new file mode 100644 index 000000000000..9ae6ce98dc67 --- /dev/null +++ b/arch/arm64/boot/dts/ti/overlay-750-8400-base-p0000017.dtso @@ -0,0 +1,9 @@ +/dts-v1/; +/plugin/; + +#include "k3-pinctrl.h" +#include +#include +#include + +#include "k3-am623-pfc-750-84xx-baseboard.dtsi" diff --git a/arch/arm64/boot/dts/ti/overlay-750-8400-interaction-p0000031.dtso b/arch/arm64/boot/dts/ti/overlay-750-8400-interaction-p0000031.dtso new file mode 100644 index 000000000000..8dccb4d1f660 --- /dev/null +++ b/arch/arm64/boot/dts/ti/overlay-750-8400-interaction-p0000031.dtso @@ -0,0 +1,9 @@ +/dts-v1/; +/plugin/; + +#include "k3-pinctrl.h" +#include +#include +#include + +#include "k3-am623-pfc-750-84xx-interaction.dtsi" diff --git a/arch/arm64/boot/dts/ti/overlay-750-8400-localbus-p0000007.dtso b/arch/arm64/boot/dts/ti/overlay-750-8400-localbus-p0000007.dtso new file mode 100644 index 000000000000..7a3a8e025d33 --- /dev/null +++ b/arch/arm64/boot/dts/ti/overlay-750-8400-localbus-p0000007.dtso @@ -0,0 +1,9 @@ +/dts-v1/; +/plugin/; + +#include "k3-pinctrl.h" +#include +#include +#include + +#include "k3-am623-pfc-750-84xx-kbus.dtsi" diff --git a/arch/arm64/boot/dts/ti/overlay-750-8400-wosm-p0000042.dtso b/arch/arm64/boot/dts/ti/overlay-750-8400-wosm-p0000042.dtso new file mode 100644 index 000000000000..6aefc7f6c67a --- /dev/null +++ b/arch/arm64/boot/dts/ti/overlay-750-8400-wosm-p0000042.dtso @@ -0,0 +1,9 @@ +/dts-v1/; +/plugin/; + +#include "k3-pinctrl.h" +#include +#include +#include + +#include "k3-am623-pfc-750-84xx-wosm.dtsi"