arm64: dts: qcom: rename pm8450a dtsi to sa8540p-pmics

pm8450a.dtsi was introduced for the descriptions of pmics used on
sa8540p based boards. Rename the dtsi to make this relationship
explicit.

Signed-off-by: Eric Chanudet <echanude@redhat.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Tested-by: Andrew Halaney <ahalaney@redhat.com> # sa8540p-ride
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221219191000.2570545-2-echanude@redhat.com

diff --git a/arch/arm64/boot/dts/qcom/pm8450a.dtsi b/arch/arm64/boot/dts/qcom/pm8450a.dtsi
deleted file mode 100644 (file)
index 34fc728..0000000
--- a/arch/arm64/boot/dts/qcom/pm8450a.dtsi
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022, Linaro Limited
- */
-
-#include <dt-bindings/spmi/spmi.h>
-
-&spmi_bus {
-       pm8450a: pmic@0 {
-               compatible = "qcom,pm8150", "qcom,spmi-pmic";
-               reg = <0x0 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8450a_gpios: gpio@c000 {
-                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pm8450a_gpios 0 0 10>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pm8450c: pmic@4 {
-               compatible = "qcom,pm8150", "qcom,spmi-pmic";
-               reg = <0x4 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8450c_gpios: gpio@c000 {
-                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pm8450c_gpios 0 0 10>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pm8450e: pmic@8 {
-               compatible = "qcom,pm8150", "qcom,spmi-pmic";
-               reg = <0x8 SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8450e_gpios: gpio@c000 {
-                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pm8450e_gpios 0 0 10>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pm8450g: pmic@c {
-               compatible = "qcom,pm8150", "qcom,spmi-pmic";
-               reg = <0xc SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pm8450g_gpios: gpio@c000 {
-                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
-                       reg = <0xc000>;
-                       gpio-controller;
-                       gpio-ranges = <&pm8450g_gpios 0 0 10>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi b/arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi
new file mode 100644 (file)
index 0000000..34fc728
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022, Linaro Limited
+ */
+
+#include <dt-bindings/spmi/spmi.h>
+
+&spmi_bus {
+       pm8450a: pmic@0 {
+               compatible = "qcom,pm8150", "qcom,spmi-pmic";
+               reg = <0x0 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8450a_gpios: gpio@c000 {
+                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8450a_gpios 0 0 10>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
+       pm8450c: pmic@4 {
+               compatible = "qcom,pm8150", "qcom,spmi-pmic";
+               reg = <0x4 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8450c_gpios: gpio@c000 {
+                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8450c_gpios 0 0 10>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
+       pm8450e: pmic@8 {
+               compatible = "qcom,pm8150", "qcom,spmi-pmic";
+               reg = <0x8 SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8450e_gpios: gpio@c000 {
+                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8450e_gpios 0 0 10>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
+       pm8450g: pmic@c {
+               compatible = "qcom,pm8150", "qcom,spmi-pmic";
+               reg = <0xc SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pm8450g_gpios: gpio@c000 {
+                       compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
+                       reg = <0xc000>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8450g_gpios 0 0 10>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
index d70859803fbde1d0682cb3940059fe77fd87655f..455e29529b660cb0679a64dc716887ff0094df6a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
+++ b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
@@ -10,7 +10,7 @@
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
 #include "sa8540p.dtsi"
-#include "pm8450a.dtsi"
+#include "sa8540p-pmics.dtsi"
 
 / {
        model = "Qualcomm SA8540P Ride";