| Message ID | 20240604085252.3686037-2-s-vadapalli@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add PCIe, SERDES and USB DT support for J722S | expand |
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@ti.com> > Acked-by: Andrew Davis <afd@ti.com> > --- > v4: > https://lore.kernel.org/r/20240601121554.2860403-2-s-vadapalli@ti.com/ > Changes since v4: > - Based on Andrew's feedback at: > https://lore.kernel.org/r/086fa11e-10f8-463d-8966-1a33a52a3146@ti.com/ > 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
On Thu, Jun 06, 2024 at 10:51:27AM +0300, Roger Quadros wrote: [...] > > 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. Roger, The existing hierarchy prior to this series is as follows: k3-am62p.dtsi = k3-am62p-main.dtsi + k3-am62p-mcu.dtsi + k3-am62p-wakeup.dtsi + k3-am62p-thermal.dtsi + <delta-1> k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> k3-j722s.dtsi = k3-am62p5.dtsi + <delta-3> k3-j722s-evm.dts = k3-j722s.dtsi + <detla-4> Based on your suggestion, you seem to propose the following hierarchy: k3-am62p-{main,mcu,thermal,wakeup}.dtsi = AM62P specific data k3-am62p.dtsi = k3-am62p-j722s-common-main.dtsi + k3-am62p-j722s-common-mcu.dtsi + k3-am62p-j722s-common-wakeup.dtsi + k3-am62p-j722s-common-thermal.dtsi + k3-am62p-{main,mcu,thermal,wakeup}.dtsi + <delta-5> k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> k3-j722s-{main,mcu,thermal,wakeup}.dtsi = J722S specific data k3-j722s.dtsi = k3-am62p-j722s-common-main.dtsi + k3-am62p-j722s-common-mcu.dtsi + k3-am62p-j722s-common-wakeup.dtsi + k3-am62p-j722s-common-thermal.dtsi + k3-j722s-{main,mcu,thermal,wakeup}.dtsi + <delta-6> k3-j722s-evm.dts = k3-j722s.dtsi + <delta-4> Please let me know whether the above organization of files matches what you expect it to look like. I will post the v6 series based on your feedback. Regards, Siddharth.
Siddharth, On 07/06/2024 14:28, Siddharth Vadapalli wrote: > On Thu, Jun 06, 2024 at 10:51:27AM +0300, Roger Quadros wrote: > > [...] > >>> 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. > > Roger, > > The existing hierarchy prior to this series is as follows: > k3-am62p.dtsi = k3-am62p-main.dtsi + k3-am62p-mcu.dtsi + > k3-am62p-wakeup.dtsi + k3-am62p-thermal.dtsi + <delta-1> > k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> > k3-j722s.dtsi = k3-am62p5.dtsi + <delta-3> > k3-j722s-evm.dts = k3-j722s.dtsi + <detla-4> > > Based on your suggestion, you seem to propose the following hierarchy: > k3-am62p-{main,mcu,thermal,wakeup}.dtsi = AM62P specific data > k3-am62p.dtsi = k3-am62p-j722s-common-main.dtsi + > k3-am62p-j722s-common-mcu.dtsi + > k3-am62p-j722s-common-wakeup.dtsi + > k3-am62p-j722s-common-thermal.dtsi + > k3-am62p-{main,mcu,thermal,wakeup}.dtsi + > <delta-5> > k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> > k3-j722s-{main,mcu,thermal,wakeup}.dtsi = J722S specific data > k3-j722s.dtsi = k3-am62p-j722s-common-main.dtsi + > k3-am62p-j722s-common-mcu.dtsi + > k3-am62p-j722s-common-wakeup.dtsi + > k3-am62p-j722s-common-thermal.dtsi + > k3-j722s-{main,mcu,thermal,wakeup}.dtsi + > <delta-6> What is the equivalent of k3-am62p5.dtsi here? That should contain k3-j722s.dtsi + CPU and OPP stuff. I suppose it should be named specific to the SoC variant part number? > k3-j722s-evm.dts = k3-j722s.dtsi + <delta-4> > > Please let me know whether the above organization of files matches what you > expect it to look like. I will post the v6 series based on your feedback. > > Regards, > Siddharth.
On Mon, Jun 10, 2024 at 10:31:07PM +0300, Roger Quadros wrote: [...] > > Based on your suggestion, you seem to propose the following hierarchy: > > k3-am62p-{main,mcu,thermal,wakeup}.dtsi = AM62P specific data > > k3-am62p.dtsi = k3-am62p-j722s-common-main.dtsi + > > k3-am62p-j722s-common-mcu.dtsi + > > k3-am62p-j722s-common-wakeup.dtsi + > > k3-am62p-j722s-common-thermal.dtsi + > > k3-am62p-{main,mcu,thermal,wakeup}.dtsi + > > <delta-5> > > k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> > > k3-j722s-{main,mcu,thermal,wakeup}.dtsi = J722S specific data > > k3-j722s.dtsi = k3-am62p-j722s-common-main.dtsi + > > k3-am62p-j722s-common-mcu.dtsi + > > k3-am62p-j722s-common-wakeup.dtsi + > > k3-am62p-j722s-common-thermal.dtsi + > > k3-j722s-{main,mcu,thermal,wakeup}.dtsi + > > <delta-6> > > What is the equivalent of k3-am62p5.dtsi here? > That should contain k3-j722s.dtsi + CPU and OPP stuff. > > I suppose it should be named specific to the SoC variant part number? AM62P (https://www.ti.com/product/AM62P) has two variants: 1. 2 Arm Cortex-A53 => AM62P3 2. 4 Arm Cortex-A53 => AM62P5 Both variants will share the common k3-am62p.dtsi J722S (https://www.ti.com/product/TDA4VEN-Q1) has only one variant: 4 Arm Cortex-A53 => J722S Which is currently identical to AM62P5 w.r.t. the number of A53s. So there isn't an equivalent of AM62P5/k3-am62p5.dtsi for J722S. k3-j722s.dtsi is a combination of k3-am62p.dtsi and k3-am62p5.dtsi. Regards, Siddharth.
On 11/06/24 14:24, Siddharth Vadapalli wrote: > On Mon, Jun 10, 2024 at 10:31:07PM +0300, Roger Quadros wrote: > > [...] > >>> Based on your suggestion, you seem to propose the following hierarchy: >>> k3-am62p-{main,mcu,thermal,wakeup}.dtsi = AM62P specific data >>> k3-am62p.dtsi = k3-am62p-j722s-common-main.dtsi + >>> k3-am62p-j722s-common-mcu.dtsi + >>> k3-am62p-j722s-common-wakeup.dtsi + >>> k3-am62p-j722s-common-thermal.dtsi + >>> k3-am62p-{main,mcu,thermal,wakeup}.dtsi + >>> <delta-5> >>> k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> >>> k3-j722s-{main,mcu,thermal,wakeup}.dtsi = J722S specific data >>> k3-j722s.dtsi = k3-am62p-j722s-common-main.dtsi + >>> k3-am62p-j722s-common-mcu.dtsi + >>> k3-am62p-j722s-common-wakeup.dtsi + >>> k3-am62p-j722s-common-thermal.dtsi + >>> k3-j722s-{main,mcu,thermal,wakeup}.dtsi + >>> <delta-6> >> >> What is the equivalent of k3-am62p5.dtsi here? >> That should contain k3-j722s.dtsi + CPU and OPP stuff. >> >> I suppose it should be named specific to the SoC variant part number? > > AM62P (https://www.ti.com/product/AM62P) has two variants: > 1. 2 Arm Cortex-A53 => AM62P3 > 2. 4 Arm Cortex-A53 => AM62P5 > Both variants will share the common k3-am62p.dtsi > > J722S (https://www.ti.com/product/TDA4VEN-Q1) has only one variant: > 4 Arm Cortex-A53 => J722S > Which is currently identical to AM62P5 w.r.t. the number of A53s. > > So there isn't an equivalent of AM62P5/k3-am62p5.dtsi for J722S. > k3-j722s.dtsi is a combination of k3-am62p.dtsi and k3-am62p5.dtsi. > Historically AM6xx devices have had CPUs in separte file as there are OPNs with different number of CPU cores Hence, how about k3-am62p5.dtsi => k3-am62p.dtsi + k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-am62p-main.dtsi (USB2 and other deltas specific to AM62P) and since J722s has no variants with less than 4 cores (and along the lines of rest of J7xx devices): k3-j722s.dtsi => k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-j722s-main.dtsi (USB3, C7x and other deltas specific to J722s;
On 11/06/2024 12:10, Vignesh Raghavendra wrote: > > > On 11/06/24 14:24, Siddharth Vadapalli wrote: >> On Mon, Jun 10, 2024 at 10:31:07PM +0300, Roger Quadros wrote: >> >> [...] >> >>>> Based on your suggestion, you seem to propose the following hierarchy: >>>> k3-am62p-{main,mcu,thermal,wakeup}.dtsi = AM62P specific data >>>> k3-am62p.dtsi = k3-am62p-j722s-common-main.dtsi + >>>> k3-am62p-j722s-common-mcu.dtsi + >>>> k3-am62p-j722s-common-wakeup.dtsi + >>>> k3-am62p-j722s-common-thermal.dtsi + >>>> k3-am62p-{main,mcu,thermal,wakeup}.dtsi + >>>> <delta-5> >>>> k3-am62p5.dtsi = k3-am62p.dtsi + <delta-2> >>>> k3-j722s-{main,mcu,thermal,wakeup}.dtsi = J722S specific data >>>> k3-j722s.dtsi = k3-am62p-j722s-common-main.dtsi + >>>> k3-am62p-j722s-common-mcu.dtsi + >>>> k3-am62p-j722s-common-wakeup.dtsi + >>>> k3-am62p-j722s-common-thermal.dtsi + >>>> k3-j722s-{main,mcu,thermal,wakeup}.dtsi + >>>> <delta-6> >>> >>> What is the equivalent of k3-am62p5.dtsi here? >>> That should contain k3-j722s.dtsi + CPU and OPP stuff. >>> >>> I suppose it should be named specific to the SoC variant part number? >> >> AM62P (https://www.ti.com/product/AM62P) has two variants: >> 1. 2 Arm Cortex-A53 => AM62P3 >> 2. 4 Arm Cortex-A53 => AM62P5 >> Both variants will share the common k3-am62p.dtsi >> >> J722S (https://www.ti.com/product/TDA4VEN-Q1) has only one variant: >> 4 Arm Cortex-A53 => J722S >> Which is currently identical to AM62P5 w.r.t. the number of A53s. >> >> So there isn't an equivalent of AM62P5/k3-am62p5.dtsi for J722S. >> k3-j722s.dtsi is a combination of k3-am62p.dtsi and k3-am62p5.dtsi. >> > > > Historically AM6xx devices have had CPUs in separte file as there are OPNs with different number of CPU cores Hence, how about > k3-am62p5.dtsi => k3-am62p.dtsi + k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-am62p-main.dtsi (USB2 and other deltas specific to AM62P) > > and since J722s has no variants with less than 4 cores (and along the lines of rest of J7xx devices): > > k3-j722s.dtsi => k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-j722s-main.dtsi (USB3, C7x and other deltas specific to J722s; > > Seems OK to me.
On Tue, Jun 11, 2024 at 08:18:34PM +0300, Roger Quadros wrote: > > > On 11/06/2024 12:10, Vignesh Raghavendra wrote: > > > > > > On 11/06/24 14:24, Siddharth Vadapalli wrote: > >> On Mon, Jun 10, 2024 at 10:31:07PM +0300, Roger Quadros wrote: [...] > >>> > >>> What is the equivalent of k3-am62p5.dtsi here? > >>> That should contain k3-j722s.dtsi + CPU and OPP stuff. > >>> > >>> I suppose it should be named specific to the SoC variant part number? > >> > >> AM62P (https://www.ti.com/product/AM62P) has two variants: > >> 1. 2 Arm Cortex-A53 => AM62P3 > >> 2. 4 Arm Cortex-A53 => AM62P5 > >> Both variants will share the common k3-am62p.dtsi > >> > >> J722S (https://www.ti.com/product/TDA4VEN-Q1) has only one variant: > >> 4 Arm Cortex-A53 => J722S > >> Which is currently identical to AM62P5 w.r.t. the number of A53s. > >> > >> So there isn't an equivalent of AM62P5/k3-am62p5.dtsi for J722S. > >> k3-j722s.dtsi is a combination of k3-am62p.dtsi and k3-am62p5.dtsi. > >> > > > > > > Historically AM6xx devices have had CPUs in separte file as there are OPNs with different number of CPU cores Hence, how about > > k3-am62p5.dtsi => k3-am62p.dtsi + k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-am62p-main.dtsi (USB2 and other deltas specific to AM62P) > > > > and since J722s has no variants with less than 4 cores (and along the lines of rest of J7xx devices): > > > > k3-j722s.dtsi => k3-am62p-j722s-common-{main,mcu,wakeup}.dtsi + k3-j722s-main.dtsi (USB3, C7x and other deltas specific to J722s; > > > > > > Seems OK to me. Vignesh, Roger, I will implement the above in the v6 series. Regards, Siddharth.
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 {
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@ti.com> Acked-by: Andrew Davis <afd@ti.com> --- v4: https://lore.kernel.org/r/20240601121554.2860403-2-s-vadapalli@ti.com/ Changes since v4: - Based on Andrew's feedback at: https://lore.kernel.org/r/086fa11e-10f8-463d-8966-1a33a52a3146@ti.com/ 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%)