On Thu, Aug 14, 2025 at 08:51:43PM +0530, Anshul Dalal wrote:
> The existing compatible name for U-Boot's k3 system controller driver
> i.e "ti,am625-system-controller" has been added to linux[1] device-tree.
> This compatible in kernel is meant for configuring the Control Module
> registers (CTRL_MMR0).
>
> However in U-Boot, the matching driver was being used to load the system
> firmware on the secure M-cores by the R5 SPL and therefore must be
> updated to a different compatible to avoid conflicts.
>
> Therefore, this patch renames all references of the compatible to
> "ti,am654-tisci-rproc-r5". The "-r5" is appended so as to avoid any
> future conflicts since r5 specific compatibles should only be useful for
> U-Boot.
>
> [1]: 5959618631fe ("dt-bindings: mfd: ti,j721e-system-controller: Add
> compatible string for AM654")
> https://lore.kernel.org/r/20250421214620.3770172-2-...@ti.com
> Signed-off-by: Anshul Dalal <ansh...@ti.com>
> ---
> arch/arm/dts/k3-am62-r5-lp-sk.dts | 2 +-
> arch/arm/dts/k3-am625-r5-beagleplay.dts | 2 +-
> arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts | 2 +-
> arch/arm/dts/k3-am625-r5-sk.dts | 2 +-
> arch/arm/dts/k3-am625-verdin-r5.dts | 2 +-
> arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts | 2 +-
> arch/arm/dts/k3-am62a7-r5-sk.dts | 2 +-
> arch/arm/dts/k3-am62p5-r5-sk.dts | 2 +-
> arch/arm/dts/k3-am62p5-verdin-r5.dts | 2 +-
> arch/arm/dts/k3-am642-r5-evm.dts | 2 +-
> arch/arm/dts/k3-am642-r5-phycore-som-2gb.dts | 2 +-
> arch/arm/dts/k3-am642-r5-sk.dts | 2 +-
> arch/arm/dts/k3-am654-r5-base-board.dts | 2 +-
> arch/arm/dts/k3-am67a-r5-beagley-ai.dts | 2 +-
> arch/arm/dts/k3-j7200-r5-common-proc-board.dts | 2 +-
> arch/arm/dts/k3-j721e-r5.dtsi | 2 +-
> arch/arm/dts/k3-j721s2-r5.dtsi | 2 +-
> arch/arm/dts/k3-j722s-r5-evm.dts | 2 +-
> arch/arm/dts/k3-j784s4-r5.dtsi | 2 +-
> doc/device-tree-bindings/power/ti,sci-pm-domain.txt | 2 +-
> doc/device-tree-bindings/remoteproc/k3-system-controller.txt | 4 ++--
> doc/device-tree-bindings/reset/ti,sci-reset.txt | 2 +-Lets get the r5 bindings upstream too, to avoid future problems. Yes, we'll need to take something like this patch prior to v6.17-dts I assume as well, but lets start fixing both problems please, thanks. -- Tom
signature.asc
Description: PGP signature
