From patchwork Wed Jul 31 17:10:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manorit Chawdhry X-Patchwork-Id: 13748991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7547BC3DA64 for ; Wed, 31 Jul 2024 17:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:CC:To:In-Reply-To:References :Message-ID:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zlhZl1fpMtrinZXymNW6JMSzbiViJzfmhLV/rRTKFKo=; b=RXDKhQnbQRjMmD+r9g8rK77gas +nktodPZqM17PYeh1c/20UlwK9TPj4U6RouHPgt6Jym0ECkjF16n3TZj8sZgPvjKpvOJOeQ7MCKmp RfQMi8vXfbKA3tMIGfnWupX6U7YIa0IKwwmw8fe+ynB4gWx/rUz+K7PwSnurxGGuD1FuVOgES/t5v aA+j7i69t/hTBKy6JI+RZXXcU7W0hz8ibW/1R75FjEZxq4MQweVB8AtqqZeQLKmMCGvZbi+PVsm5P XQDw3HB7QFLHh4POWWuF6v8kQbAst+TXvvsK3c/fspqINGVQbDdMIcUqA64vZQTE5R3SuKKE0FxUk /Num8ipw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZCrT-00000001ycP-0vNw; Wed, 31 Jul 2024 17:11:39 +0000 Received: from fllv0016.ext.ti.com ([198.47.19.142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZCqZ-00000001yL8-42K1 for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 17:10:45 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 46VHAdx4108309; Wed, 31 Jul 2024 12:10:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1722445839; bh=zlhZl1fpMtrinZXymNW6JMSzbiViJzfmhLV/rRTKFKo=; h=From:Date:Subject:References:In-Reply-To:To:CC; b=w5zfckEpPLcNKAb+6nG0CPzWyBzoVWdeGypu+4lHTHqSpmeTisfUumOsf2BUO6JJZ BryLbWcJv+3ynm8vZtQrJXrsJgdqUiYZzFoFNTr2V0CxVS90vff5mv7mFzXxUCNxrh ctBTmPD7t8nf/zeNtX3b7/J+P09f7Wx28Kkq4Ovc= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 46VHAd3C082425 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 31 Jul 2024 12:10:39 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 31 Jul 2024 12:10:39 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 31 Jul 2024 12:10:39 -0500 Received: from [127.0.1.1] (uda0497581.dhcp.ti.com [10.24.68.185]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 46VHAVgO036362; Wed, 31 Jul 2024 12:10:36 -0500 From: Manorit Chawdhry Date: Wed, 31 Jul 2024 22:40:27 +0530 Subject: [PATCH v3 1/9] arm64: dts: ti: Move j784s4-{} include files to j784s4-j742s2-{}-common.dtsi MIME-Version: 1.0 Message-ID: <20240731-b4-upstream-j742s2-v3-1-da7fe3aa9e90@ti.com> References: <20240731-b4-upstream-j742s2-v3-0-da7fe3aa9e90@ti.com> In-Reply-To: <20240731-b4-upstream-j742s2-v3-0-da7fe3aa9e90@ti.com> To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: , , , Udit Kumar , Neha Malcom Francis , Aniket Limaye , Manorit Chawdhry X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1722445831; l=3022; i=m-chawdhry@ti.com; s=20231127; h=from:subject:message-id; bh=KM94wb8SuRIdpVfm4xCuPtTZylQRif7udldhutgnZw4=; b=tGGJ7k1kPGo25yzuUOBTJit1k2bsNbaJoLy+XeNMCT6kxlX84Ih/QLuByt3X7MYkZPAb3Vf5a aadrohgbneYCd5dLCD81SpdYYmU1MsWNZ0lUlKuTbDbZ84dDr3HMP3+ X-Developer-Key: i=m-chawdhry@ti.com; a=ed25519; pk=fsr6Tm39TvsTgfyfFQLk+nnqIz2sBA1PthfqqfiiYSs= X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240731_101044_129735_CF99E51A X-CRM114-Status: GOOD ( 12.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org J784S4 shares a lot of things with J742s2. Move the files to common so that the split between j784s4 and j742s2 can be done at a later point. Signed-off-by: Manorit Chawdhry --- .../ti/{k3-j784s4-main.dtsi => k3-j784s4-j742s2-main-common.dtsi} | 2 +- ...84s4-mcu-wakeup.dtsi => k3-j784s4-j742s2-mcu-wakeup-common.dtsi} | 2 +- ...{k3-j784s4-thermal.dtsi => k3-j784s4-j742s2-thermal-common.dtsi} | 0 arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi similarity index 99% rename from arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi index f170f80f00c1..17abd0f1560a 100644 --- a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only OR MIT /* - * Device Tree Source for J784S4 SoC Family Main Domain peripherals + * Device Tree Source for J784S4 and J742S2 SoC Family Main Domain peripherals * * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi similarity index 99% rename from arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi index f3a6ed1c979d..346623fa2ee9 100644 --- a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only OR MIT /* - * Device Tree Source for J784S4 SoC Family MCU/WAKEUP Domain peripherals + * Device Tree Source for J784S4 and J742S2 SoC Family MCU/WAKEUP Domain peripherals * * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi similarity index 100% rename from arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi diff --git a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi index 73cc3c1fec08..76e43ee44496 100644 --- a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi @@ -296,10 +296,10 @@ cbass_mcu_wakeup: bus@28380000 { }; thermal_zones: thermal-zones { - #include "k3-j784s4-thermal.dtsi" + #include "k3-j784s4-j742s2-thermal-common.dtsi" }; }; /* Now include peripherals from each bus segment */ -#include "k3-j784s4-main.dtsi" -#include "k3-j784s4-mcu-wakeup.dtsi" +#include "k3-j784s4-j742s2-main-common.dtsi" +#include "k3-j784s4-j742s2-mcu-wakeup-common.dtsi"