The J742S2 SoC reuses the common k3-j784s4-j742s2-mcu-wakeup-common.dtsi
for its MCU domain, but it does not override the firmware-name property
for its R5F cores. This causes the wrong firmware binaries to be
referenced.

Introduce a new k3-j742s2-mcu-wakeup.dtsi file to override the
firmware-name property with correct names for J742s2.

Fixes: 38fd90a3e1ac ("arm64: dts: ti: Introduce J742S2 SoC family")
Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
---
v2: Changelog:
1. Posted this patch as a fix as decided in v1, so added Fixes tag.

Link to v1:
https://lore.kernel.org/all/20250522073426.329344-2-b-padhi@ti.com/

 .../arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi | 17 +++++++++++++++++
 arch/arm64/boot/dts/ti/k3-j742s2.dtsi           |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi

diff --git a/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi
new file mode 100644
index 000000000000..61db2348d6a4
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+/*
+ * Device Tree Source for J742S2 SoC Family
+ *
+ * TRM: https://www.ti.com/lit/pdf/spruje3
+ *
+ * Copyright (C) 2025 Texas Instruments Incorporated - https://www.ti.com/
+ *
+ */
+
+&mcu_r5fss0_core0 {
+	firmware-name = "j742s2-mcu-r5f0_0-fw";
+};
+
+&mcu_r5fss0_core1 {
+	firmware-name = "j742s2-mcu-r5f0_1-fw";
+};
diff --git a/arch/arm64/boot/dts/ti/k3-j742s2.dtsi b/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
index 7a72f82f56d6..d265df1abade 100644
--- a/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
@@ -96,3 +96,4 @@ cpu3: cpu@3 {
 };
 
 #include "k3-j742s2-main.dtsi"
+#include "k3-j742s2-mcu-wakeup.dtsi"
-- 
2.34.1

Hi Beleswar Padhi,

On Sat, 23 Aug 2025 22:01:11 +0530, Beleswar Padhi wrote:
> The J742S2 SoC reuses the common k3-j784s4-j742s2-mcu-wakeup-common.dtsi
> for its MCU domain, but it does not override the firmware-name property
> for its R5F cores. This causes the wrong firmware binaries to be
> referenced.
> 
> Introduce a new k3-j742s2-mcu-wakeup.dtsi file to override the
> firmware-name property with correct names for J742s2.
> 
> [...]

I have applied the following to branch ti-k3-dts-next on [1].
Thank you!

[1/1] arm64: dts: ti: k3-j742s2-mcu-wakeup: Override firmware-name for MCU R5F cores
      commit: 00c8fdc2809f05422d919809106f54c23de3cba3

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
https://ti.com/opensource

On 8/23/2025 10:01 PM, Beleswar Padhi wrote:
> The J742S2 SoC reuses the common k3-j784s4-j742s2-mcu-wakeup-common.dtsi
> for its MCU domain, but it does not override the firmware-name property
> for its R5F cores. This causes the wrong firmware binaries to be
> referenced.
>
> Introduce a new k3-j742s2-mcu-wakeup.dtsi file to override the
> firmware-name property with correct names for J742s2.
>
> Fixes: 38fd90a3e1ac ("arm64: dts: ti: Introduce J742S2 SoC family")
> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> ---
> v2: Changelog:
> 1. Posted this patch as a fix as decided in v1, so added Fixes tag.
>
> Link to v1:
> https://lore.kernel.org/all/20250522073426.329344-2-b-padhi@ti.com/
>
>   .../arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi | 17 +++++++++++++++++
>   arch/arm64/boot/dts/ti/k3-j742s2.dtsi           |  1 +
>   2 files changed, 18 insertions(+)
>   create mode 100644 arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi
>
> diff --git a/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi
> new file mode 100644
> index 000000000000..61db2348d6a4
> --- /dev/null
> +++ b/arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: GPL-2.0-only OR MIT
> +/*
> + * Device Tree Source for J742S2 SoC Family
> + *
> + * TRM: https://www.ti.com/lit/pdf/spruje3
> + *
> + * Copyright (C) 2025 Texas Instruments Incorporated - https://www.ti.com/
> + *
> + */
> +
> +&mcu_r5fss0_core0 {
> +	firmware-name = "j742s2-mcu-r5f0_0-fw";
> +};
> +
> +&mcu_r5fss0_core1 {
> +	firmware-name = "j742s2-mcu-r5f0_1-fw";
> +};


Reviewed-by: Udit Kumar <u-kumar1@ti.com>


> diff --git a/arch/arm64/boot/dts/ti/k3-j742s2.dtsi b/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
> index 7a72f82f56d6..d265df1abade 100644
> --- a/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j742s2.dtsi
> @@ -96,3 +96,4 @@ cpu3: cpu@3 {
>   };
>   
>   #include "k3-j742s2-main.dtsi"
> +#include "k3-j742s2-mcu-wakeup.dtsi"