Skip to contentSkip to conversation

arm64: dts: qcom: sa8540p-pmics: rename pmic labels

PATCH Applied Johan Hovold 2 participants 4 messages Jan 11, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover arm64: dts: qcom: sa8540p-pmics: rename pmic labels

These patches add a missing include to the new sa8540p-pmics dtsi and rename the PMIC labels so that they reflect the actual name of the PMICs.

Johan

Changes in v2
- fix patch summary prefix (Eric)

Johan Hovold (2):
arm64: dts: qcom: sa8540p-pmics: add missing interrupt include
arm64: dts: qcom: sa8540p-pmics: rename pmic labels

 arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi | 25 +++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)
Signature · 1 line
2.38.2
#1 lore raw

PATCH v2 1/2 arm64: dts: qcom: sa8540p-pmics: add missing interrupt include

Add the missing interrupt-controller include which is needed by the RTC node.

---
 arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi +1 -0
index c9b8da43b237..8c393f0bd6a8 100644
@@ -4,6 +4,7 @@
  * Copyright (c) 2022, Linaro Limited
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
 &spmi_bus {
Signature · 1 line
2.38.2
#2 lore raw

PATCH v2 2/2 arm64: dts: qcom: sa8540p-pmics: rename pmic labels

In reply to Johan Hovold

The SA8540P PMICs are named PMM8540. Rename the devicetree source labels to reflect this.

---
 arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi +12 -12
index 8c393f0bd6a8..1221be89b3de 100644
@@ -8,7 +8,7 @@
 #include <dt-bindings/spmi/spmi.h>
 
 &spmi_bus {
-	pm8450a: pmic@0 {
+	pmm8540a: pmic@0 {
 		compatible = "qcom,pm8150", "qcom,spmi-pmic";
 		reg = <0x0 SPMI_USID>;
 		#address-cells = <1>;
@@ -22,62 +22,62 @@ rtc@6000 {
 			wakeup-source;
 		};
 
-		pm8450a_gpios: gpio@c000 {
+		pmm8540a_gpios: gpio@c000 {
 			compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
 			reg = <0xc000>;
 			gpio-controller;
-			gpio-ranges = <&pm8450a_gpios 0 0 10>;
+			gpio-ranges = <&pmm8540a_gpios 0 0 10>;
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
 	};
 
-	pm8450c: pmic@4 {
+	pmm8540c: pmic@4 {
 		compatible = "qcom,pm8150", "qcom,spmi-pmic";
 		reg = <0x4 SPMI_USID>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		pm8450c_gpios: gpio@c000 {
+		pmm8540c_gpios: gpio@c000 {
 			compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
 			reg = <0xc000>;
 			gpio-controller;
-			gpio-ranges = <&pm8450c_gpios 0 0 10>;
+			gpio-ranges = <&pmm8540c_gpios 0 0 10>;
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
 	};
 
-	pm8450e: pmic@8 {
+	pmm8540e: pmic@8 {
 		compatible = "qcom,pm8150", "qcom,spmi-pmic";
 		reg = <0x8 SPMI_USID>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		pm8450e_gpios: gpio@c000 {
+		pmm8540e_gpios: gpio@c000 {
 			compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
 			reg = <0xc000>;
 			gpio-controller;
-			gpio-ranges = <&pm8450e_gpios 0 0 10>;
+			gpio-ranges = <&pmm8540e_gpios 0 0 10>;
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
 		};
 	};
 
-	pm8450g: pmic@c {
+	pmm8540g: pmic@c {
 		compatible = "qcom,pm8150", "qcom,spmi-pmic";
 		reg = <0xc SPMI_USID>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		pm8450g_gpios: gpio@c000 {
+		pmm8540g_gpios: gpio@c000 {
 			compatible = "qcom,pm8150-gpio", "qcom,spmi-gpio";
 			reg = <0xc000>;
 			gpio-controller;
-			gpio-ranges = <&pm8450g_gpios 0 0 10>;
+			gpio-ranges = <&pmm8540g_gpios 0 0 10>;
 			#gpio-cells = <2>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
Signature · 1 line
2.38.2
maintainer Applied
#3 lore raw
In reply to Johan Hovold
Quoted 8 lines · Johan Hovold

These patches add a missing include to the new sa8540p-pmics dtsi and rename the PMIC labels so that they reflect the actual name of the PMICs.

Johan

[...]

Applied, thanks!

[1/2] arm64: dts: qcom: sa8540p-pmics: add missing interrupt include

      commit: 32c028fccb120603368c4f2aaac44376b4a1a21e
[2/2] arm64: dts: qcom: sa8540p-pmics: rename pmic labels
      commit: aab961de74f10968ea67f42c0ca7c5cd866df3ec

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>