On 04/06/2024 11:52, Siddharth Vadapalli wrote:
> The AM62P and J722S SoCs share most of the peripherals. With the aim of
> reusing the existing k3-am62p-{mcu,main,wakeup}.dtsi files for J722S SoC,
> rename them to indicate that they are shared with J722S SoC.
>
> The peripherals that are not shared will be moved in the upcoming patches
> to the respective k3-{soc}-{mcu,main,wakeup}.dtsi files without "common" in
> the filename, emphasizing that they are not shared.
>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@xxxxxx>
> Acked-by: Andrew Davis <afd@xxxxxx>
> ---
> v4:
> https://lore.kernel.org/r/20240601121554.2860403-2-s-vadapalli@xxxxxx/
> Changes since v4:
> - Based on Andrew's feedback at:
> https://lore.kernel.org/r/086fa11e-10f8-463d-8966-1a33a52a3146@xxxxxx/
> MCU was retained as-is while main and wakeup were changed to MAIN and
> WAKEUP in the respective shared files.
> - Newline has been added between the file description and the Copyright
> in all the files.
> - Collected Acked-by tag since these changes have been made.
>
> .../{k3-am62p-main.dtsi => k3-am62p-j722s-common-main.dtsi} | 3 ++-
> .../{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} | 3 ++-
> ...-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} | 3 ++-
> .../dts/ti/{k3-am62p.dtsi => k3-am62p-j722s-common.dtsi} | 6 +++---
> arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 2 +-
> 5 files changed, 10 insertions(+), 7 deletions(-)
> rename arch/arm64/boot/dts/ti/{k3-am62p-main.dtsi => k3-am62p-j722s-common-main.dtsi} (99%)
> rename arch/arm64/boot/dts/ti/{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} (98%)
> rename arch/arm64/boot/dts/ti/{k3-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} (97%)
> rename arch/arm64/boot/dts/ti/{k3-am62p.dtsi => k3-am62p-j722s-common.dtsi} (97%)
This is not correct.
If J722 has different CBASS components than AM62p then we should leave k3-am62p.dtsi
as it is and introduce a new k3-j722.dtsi with relevant CBASS components.
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
> similarity index 99%
> rename from arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
> rename to arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
> index 900d1f9530a2..bf6384ba824a 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
> @@ -1,6 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0-only OR MIT
> /*
> - * Device Tree file for the AM62P main domain peripherals
> + * Device Tree file for the MAIN domain peripherals shared by AM62P and J722S
> + *
> * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/
> */
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> similarity index 98%
> rename from arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi
> rename to arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> index b973b550eb9d..1d4e5fc8b4e0 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
> @@ -1,6 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0-only OR MIT
> /*
> - * Device Tree file for the AM62P MCU domain peripherals
> + * Device Tree file for the MCU domain peripherals shared by AM62P and J722S
> + *
> * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/
> */
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-wakeup.dtsi
> similarity index 97%
> rename from arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi
> rename to arch/arm64/boot/dts/ti/k3-am62p-j722s-common-wakeup.dtsi
> index c71d9624ea27..f6ec6e8e171d 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-wakeup.dtsi
> @@ -1,6 +1,7 @@
> // SPDX-License-Identifier: GPL-2.0-only OR MIT
> /*
> - * Device Tree file for the AM62P wakeup domain peripherals
> + * Device Tree file for the WAKEUP domain peripherals shared by AM62P and J722S
> + *
> * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/
> */
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common.dtsi
> similarity index 97%
> rename from arch/arm64/boot/dts/ti/k3-am62p.dtsi
> rename to arch/arm64/boot/dts/ti/k3-am62p-j722s-common.dtsi
> index 94babc412575..d85d05e0792a 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common.dtsi
> @@ -120,6 +120,6 @@ cbass_wakeup: bus@b00000 {
> };
>
> /* Now include peripherals for each bus segment */
> -#include "k3-am62p-main.dtsi"
> -#include "k3-am62p-mcu.dtsi"
> -#include "k3-am62p-wakeup.dtsi"
> +#include "k3-am62p-j722s-common-main.dtsi"
> +#include "k3-am62p-j722s-common-mcu.dtsi"
> +#include "k3-am62p-j722s-common-wakeup.dtsi"
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p5.dtsi b/arch/arm64/boot/dts/ti/k3-am62p5.dtsi
> index 41f479dca455..b7bb04a7968f 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p5.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62p5.dtsi
> @@ -8,7 +8,7 @@
>
> /dts-v1/;
>
> -#include "k3-am62p.dtsi"
> +#include "k3-am62p-j722s-common.dtsi"
>
> / {
> cpus {
--
cheers,
-roger
