| Message ID | 20240612132409.2477888-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 12/06/2024 16:24, Siddharth Vadapalli wrote: > The AM62P and J722S SoCs share most of the peripherals. With the aim of > reusing the existing k3-am62p-{mcu,main,thermal,wakeup}.dtsi files for > J722S SoC, rename them to indicate that they are shared with the 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> Acked-by: Roger Quadros <rogerq@kernel.org>
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-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-thermal.dtsi similarity index 100% rename from arch/arm64/boot/dts/ti/k3-am62p-thermal.dtsi rename to arch/arm64/boot/dts/ti/k3-am62p-j722s-common-thermal.dtsi 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.dtsi index 94babc412575..2d11c80107b5 100644 --- a/arch/arm64/boot/dts/ti/k3-am62p.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62p.dtsi @@ -116,10 +116,10 @@ cbass_wakeup: bus@b00000 { }; }; - #include "k3-am62p-thermal.dtsi" + #include "k3-am62p-j722s-common-thermal.dtsi" }; /* 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"
The AM62P and J722S SoCs share most of the peripherals. With the aim of reusing the existing k3-am62p-{mcu,main,thermal,wakeup}.dtsi files for J722S SoC, rename them to indicate that they are shared with the 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> --- v5: https://lore.kernel.org/r/20240604085252.3686037-2-s-vadapalli@ti.com/ Changes since v5: - k3-am62p.dtsi is left as-is, instead of changing it to k3-am62p-j722s-common.dtsi. - Renamed k3-am62p-thermal.dtsi to k3-am62p-j722s-common-thermal.dtsi. ...k3-am62p-main.dtsi => k3-am62p-j722s-common-main.dtsi} | 3 ++- .../{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} | 3 ++- ...2p-thermal.dtsi => k3-am62p-j722s-common-thermal.dtsi} | 0 ...m62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} | 3 ++- arch/arm64/boot/dts/ti/k3-am62p.dtsi | 8 ++++---- 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-thermal.dtsi => k3-am62p-j722s-common-thermal.dtsi} (100%) rename arch/arm64/boot/dts/ti/{k3-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} (97%)