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 <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
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 <dt-bindings/input/ti-drv260x.h>
>
> /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 <dt-bindings/input/input.h>
> #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 <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> #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 <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> 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 <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> 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 <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> 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 <dt-bindings/input/input.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>
> 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 <dt-bindings/input/input.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> #include <dt-bindings/leds/common.h>
> 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 <dt-bindings/input/input.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> 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 <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include <arm64/qcom/pm8150b.dtsi>
> -#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 <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #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 <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #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 <dt-bindings/regulator/qcom,rpmh-regulator.h>
> #include <arm64/qcom/pmk8350.dtsi>
> #include <arm64/qcom/pm8150b.dtsi>
> -#include "qcom-pmx65.dtsi"
> +#include "pmx65.dtsi"
>
> / {
> model = "Qualcomm Technologies, Inc. SDX65 MTP";
