From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB913EB64DC for ; Tue, 27 Jun 2023 11:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbjF0LIM (ORCPT ); Tue, 27 Jun 2023 07:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbjF0LIL (ORCPT ); Tue, 27 Jun 2023 07:08:11 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 761E01FE2 for ; Tue, 27 Jun 2023 04:08:09 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b698371937so43491661fa.3 for ; Tue, 27 Jun 2023 04:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687864088; x=1690456088; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=7kf5vgYMQadfUTXhaKrzrwZjtYBeagw2DAOCQqEJ6gM=; b=u1Nt0uwij4IxxwLHWUtQnLHx2hJM309BXgQLdXyCa+4YwHaiGZEY3IxNqKRFtJVUWo rMpEfW9AKi05el08ZvJ8g7QILk6Su3R+++XyCMAwMyj1YJ8m67Knfzex3Ohr3Hr36eeN Wz9R9jerOSBdWU7FGIA3meWQYOH829ghiYyuBxTSRVlcn3MDDC37jJJnjyQIbyXHIgqC Vr6A2o8+ghWTaSQtdqS92Ui7X146SYepl/ZcQEOBqYqdxxKoHX2vQGpSYLUerHLtQDrw lDtlOpluA+OSCnd6vZ3baLNkfNVBN/81TDjvN9prdZ9U9/UFf80b+ReJZe7g/tiaWoEA a7Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687864088; x=1690456088; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7kf5vgYMQadfUTXhaKrzrwZjtYBeagw2DAOCQqEJ6gM=; b=boX3723vFQNIaR17P6LBrq8YHqWBcQxskwCJk9rrG3PwBz5GYE/9plALFXX7cyIpZx sA17UR+RrdJhZGIy11bEBTiZ+7XZ4lIRnEf8kj6uPTDHUVR7a+YDI23KkISep/xbtDW9 OmuhVEtVcx2p5sHkc6P3OpWTtcRs0sgus6NTCdL1iPkYd6+eKd6ADm1BjwlLGeAlmIFY oAk60ERM1AjTgzfJFat/acewWA/v9onzbWbt+FKdlo6JD/eE/mRYsimT3BNqLEuCnLcG U52nicKPrTv4vwDXgYR4YTdF78trMAVgHxpV+UWSlOV+aXVMqqdBTpbmkLcyMptQTC87 3/Pw== X-Gm-Message-State: AC+VfDzDpnI3nrxEDVzURHkxQneCP448ecUt4Nf71prpMFkYP/Rq7qdt NkVooVoeK08qakW+Xyla9jOuqpjSgjfcl+Cun60= X-Google-Smtp-Source: ACHHUZ7yto0rSgoADxPVOEbp1jt8VuN9QH0AcQBVOB9XL0SPDu24bO+C2ZaNzGlBp8ve1/Y6n2H1Ig== X-Received: by 2002:a19:4f54:0:b0:4f8:5d94:2e46 with SMTP id a20-20020a194f54000000b004f85d942e46mr9477130lfk.48.1687864067323; Tue, 27 Jun 2023 04:07:47 -0700 (PDT) Received: from [192.168.1.101] (abxj103.neoplus.adsl.tpnet.pl. [83.9.3.103]) by smtp.gmail.com with ESMTPSA id e3-20020ac25463000000b004f866200361sm1478606lfn.164.2023.06.27.04.07.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Jun 2023 04:07:47 -0700 (PDT) Message-ID: <60a2fc60-eac9-1e44-be3c-8b7f85a70573@linaro.org> Date: Tue, 27 Jun 2023 13:07:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files Content-Language: en-US To: Dmitry Baryshkov , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org References: <20230627012422.206077-1-dmitry.baryshkov@linaro.org> <20230627012422.206077-7-dmitry.baryshkov@linaro.org> From: Konrad Dybcio In-Reply-To: <20230627012422.206077-7-dmitry.baryshkov@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 27.06.2023 03:24, Dmitry Baryshkov wrote: > As the vendor DTS files were moved to per-vendor subdirs, there no need > to use common prefixes. Drop the `qcom-' prefix from PMIC dtsi file. > This makes 32-bit qcom/ dts files closer to arm64 ones. > > Signed-off-by: Dmitry Baryshkov > --- Reviewed-by: Konrad Dybcio Konrad > arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 0 > arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0 > arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 0 > arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0 > arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0 > arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0 > arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++-- > arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 2 +- > .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +- > arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- > 23 files changed, 23 insertions(+), 23 deletions(-) > rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (100%) > rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%) > rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (100%) > rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%) > rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%) > rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%) > > diff --git a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pm8226.dtsi > rename to arch/arm/boot/dts/qcom/pm8226.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom/pm8841.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pm8841.dtsi > rename to arch/arm/boot/dts/qcom/pm8841.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pm8941.dtsi > rename to arch/arm/boot/dts/qcom/pm8941.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pma8084.dtsi > rename to arch/arm/boot/dts/qcom/pma8084.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pmx55.dtsi > rename to arch/arm/boot/dts/qcom/pmx55.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi b/arch/arm/boot/dts/qcom/pmx65.dtsi > similarity index 100% > rename from arch/arm/boot/dts/qcom/qcom-pmx65.dtsi > rename to arch/arm/boot/dts/qcom/pmx65.dtsi > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > index aa0e0e8d2a97..a39f5a161b03 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts > @@ -6,7 +6,7 @@ > /dts-v1/; > > #include "qcom-msm8226.dtsi" > -#include "qcom-pm8226.dtsi" > +#include "pm8226.dtsi" > > /delete-node/ &adsp_region; > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts > index de19640efe55..59b218042d32 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts > @@ -6,7 +6,7 @@ > /dts-v1/; > > #include "qcom-msm8226.dtsi" > -#include "qcom-pm8226.dtsi" > +#include "pm8226.dtsi" > #include > > /delete-node/ &adsp_region; > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts > index b887e5361ec3..feb78afef3a6 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts > @@ -6,7 +6,7 @@ > /dts-v1/; > > #include "qcom-msm8226.dtsi" > -#include "qcom-pm8226.dtsi" > +#include "pm8226.dtsi" > > /delete-node/ &adsp_region; > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts > index 884d99297d4c..42d3867dca42 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts > @@ -7,7 +7,7 @@ > > #include > #include "qcom-msm8226.dtsi" > -#include "qcom-pm8226.dtsi" > +#include "pm8226.dtsi" > > /delete-node/ &adsp_region; > /delete-node/ &smem_region; > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts > index e0679436000b..5a8af16bf02d 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts > @@ -4,8 +4,8 @@ > #include > #include > #include "qcom-msm8974.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > > /delete-node/ &mpss_region; > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts > index 116e59a3b76d..1df24c922be9 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-apq8084.dtsi" > -#include "qcom-pma8084.dtsi" > +#include "pma8084.dtsi" > > / { > model = "Qualcomm APQ8084/IFC6540"; > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts > index c6b6680248a6..d4e6aee034af 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-apq8084.dtsi" > -#include "qcom-pma8084.dtsi" > +#include "pma8084.dtsi" > > / { > model = "Qualcomm APQ 8084-MTP"; > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts > index 60bdfddeae69..da99f770d4f5 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > #include > #include > #include > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi > index 68a2f9094e53..23ae474698aa 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > #include > #include > #include > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts > index f531d2679f6c..24f9521a0be6 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974pro.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > #include > #include > #include > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts > index 8230d0e1d95d..c0ca264d8140 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974pro.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > #include > #include > > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts > index 3e2c86591ee2..325feb89b343 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974pro.dtsi" > -#include "qcom-pma8084.dtsi" > +#include "pma8084.dtsi" > #include > #include > #include > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts > index 154639d56f35..efe21289c9fe 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts > +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "qcom-msm8974pro.dtsi" > -#include "qcom-pm8841.dtsi" > -#include "qcom-pm8941.dtsi" > +#include "pm8841.dtsi" > +#include "pm8941.dtsi" > #include > #include > #include > diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts > index 7e97ad5803d8..247069361909 100644 > --- a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts > +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts > @@ -9,7 +9,7 @@ > #include "qcom-sdx55.dtsi" > #include > #include > -#include "qcom-pmx55.dtsi" > +#include "pmx55.dtsi" > > / { > model = "Qualcomm Technologies, Inc. SDX55 MTP"; > diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts > index 51058b065279..082f7ed1a01f 100644 > --- a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts > +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts > @@ -8,7 +8,7 @@ > #include > #include > #include "qcom-sdx55.dtsi" > -#include "qcom-pmx55.dtsi" > +#include "pmx55.dtsi" > > / { > model = "Thundercomm T55 Development Kit"; > diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts > index 8fadc6e70692..e336a15b45c4 100644 > --- a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts > +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts > @@ -8,7 +8,7 @@ > #include > #include > #include "qcom-sdx55.dtsi" > -#include "qcom-pmx55.dtsi" > +#include "pmx55.dtsi" > > / { > model = "Telit FN980 TLB"; > diff --git a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts > index 02d8d6e241ae..5385d9782f8e 100644 > --- a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts > +++ b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include "qcom-pmx65.dtsi" > +#include "pmx65.dtsi" > > / { > model = "Qualcomm Technologies, Inc. SDX65 MTP";