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 <[email protected]>
---
No changelog since this patch is introduced in this version of the
series.
.../{k3-am62p-main.dtsi => k3-am62p-j722s-common-main.dtsi} | 2 +-
.../{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} | 2 +-
...-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} | 2 +-
.../dts/ti/{k3-am62p.dtsi => k3-am62p-j722s-common.dtsi} | 6 +++---
arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 2 +-
5 files changed, 7 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%)
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..ea214f649ebd 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,6 @@
// 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..a5dbaf3ff41b 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,6 @@
// 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..ca493f4e1acd 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,6 @@
// 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 {
--
2.40.1
On 6/1/24 7:15 AM, 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 <[email protected]>
> ---
> No changelog since this patch is introduced in this version of the
> series.
>
> .../{k3-am62p-main.dtsi => k3-am62p-j722s-common-main.dtsi} | 2 +-
> .../{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} | 2 +-
> ...-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} | 2 +-
> .../dts/ti/{k3-am62p.dtsi => k3-am62p-j722s-common.dtsi} | 6 +++---
> arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 2 +-
> 5 files changed, 7 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%)
>
> 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..ea214f649ebd 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,6 @@
> // 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..a5dbaf3ff41b 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,6 @@
> // 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
s/mcu/MCU
Same for the other domains (WAKEUP, MAIN, MCU), makes it more clear these are names,
and not just adjectives for the domains.
> * 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..ca493f4e1acd 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,6 @@
> // 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
While we are here, might be good to add a newline here between the description
and the copyright line to match the other SoCs DT files.
Otherwise,
Acked-by: Andrew Davis <[email protected]>
> * 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 {
On Mon, Jun 03, 2024 at 09:09:39AM -0500, Andrew Davis wrote:
> On 6/1/24 7:15 AM, 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 <[email protected]>
> > ---
> > No changelog since this patch is introduced in this version of the
> > series.
> >
[...]
> > 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..a5dbaf3ff41b 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,6 @@
> > // 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
>
> s/mcu/MCU
>
> Same for the other domains (WAKEUP, MAIN, MCU), makes it more clear these are names,
> and not just adjectives for the domains.
I had changed the "MCU" to "mcu" to match the convention in other files.
Based on your feedback, I seem to have switched to the wrong convention.
I will fix this in the v5 series.
>
> > * 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..ca493f4e1acd 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,6 @@
> > // 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
>
> While we are here, might be good to add a newline here between the description
> and the copyright line to match the other SoCs DT files.
>
> Otherwise,
>
> Acked-by: Andrew Davis <[email protected]>
Sure, I will add the missing newline and collect your "Acked-by" tag for
this patch in the v5 series. Thank you for reviewing this patch.
[...]
Regards,
Siddharth.