Skip to contentSkip to conversation

random msm bindings fixes

PATCH Applied Konrad Dybcio 5 participants 17 messages Jun 26, 2023 – Jul 22, 2023

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

cover random msm bindings fixes

---
Konrad Dybcio (7):
dt-bindings: qcom: Allow SoC names ending in "pro"
dt-bindings: remoteproc: qcom,msm8996-mss-pil: Fix 8996 clocks
arm64: dts: qcom: pm6150l: Add missing short interrupt
arm64: dts: qcom: pm660l: Add missing short interrupt
arm64: dts: qcom: pmi8950: Add missing OVP interrupt
arm64: dts: qcom: pmi8994: Add missing OVP interrupt
arm64: dts: qcom: sc8180x: Add missing 'cache-unified' to L3

 Documentation/devicetree/bindings/arm/qcom-soc.yaml                | 2 +-
 .../devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml       | 7 +++----
 arch/arm64/boot/dts/qcom/pm6150l.dtsi                              | 5 +++--
 arch/arm64/boot/dts/qcom/pm660l.dtsi                               | 5 +++--
 arch/arm64/boot/dts/qcom/pmi8950.dtsi                              | 5 +++--
 arch/arm64/boot/dts/qcom/pmi8994.dtsi                              | 5 +++--
 arch/arm64/boot/dts/qcom/sc8180x.dtsi                              | 1 +
 7 files changed, 17 insertions(+), 13 deletions(-)

---
base-commit: 3eedd211ad93c322fb360b83a3d76a2c6cd622dc
change-id: 20230626-topic-bindingsfixups-93d737dbf054

Best regards,

Signature · 1 line
Konrad Dybcio <[email protected]>
#1 lore raw

PATCH 1/7 dt-bindings: qcom: Allow SoC names ending in "pro"

There are a couple of SoCs whose names end in "pro", with the currently- upstream examples being msm8974pro and msm8996pro. Allow such suffix in SoC-specific compatibles.

Fixes 5aa332c5e7ca ("dt-bindings: qcom: document preferred compatible naming")
---
 Documentation/devicetree/bindings/arm/qcom-soc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/qcom-soc.yaml +1 -1
index e333ec4a9c5f..607a1cf1ef94 100644
@@ -31,7 +31,7 @@ properties:
   compatible:
     oneOf:
       # Preferred naming style for compatibles of SoC components:
-      - pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$"
+      - pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+(pro|)-.*$"
       - pattern: "^qcom,(sa|sc)8[0-9]+[a-z][a-z]?-.*$"
 
       # Legacy namings - variations of existing patterns/compatibles are OK,
Signature · 1 line
2.41.0
maintainer Acked-by on v1 1/7
#2 lore raw

Re: [PATCH 1/7] dt-bindings: qcom: Allow SoC names ending in "pro"

Quoted 15 lines · Konrad Dybcio

There are a couple of SoCs whose names end in "pro", with the currently- upstream examples being msm8974pro and msm8996pro. Allow such suffix in SoC-specific compatibles.

Fixes 5aa332c5e7ca ("dt-bindings: qcom: document preferred compatible naming")
---
 Documentation/devicetree/bindings/arm/qcom-soc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/qcom-soc.yaml +0 -0
index e333ec4a9c5f..607a1cf1ef94 100644

Documentation/devicetree/bindings/arm/qcom-soc.yaml properties: · line 34

Quoted 5 lines
Documentation/devicetree/bindings/arm/qcom-soc.yaml +1 -1
@@ -31,7 +31,7 @@ properties:
   compatible:
     oneOf:
       # Preferred naming style for compatibles of SoC components:
-      - pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$"
+      - pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+(pro|)-.*$"

"(pro)?" would be slightly better than "(pro|)" IMO.

Quoted 7 lines
Documentation/devicetree/bindings/arm/qcom-soc.yaml +0 -0
       - pattern: "^qcom,(sa|sc)8[0-9]+[a-z][a-z]?-.*$"
 
       # Legacy namings - variations of existing patterns/compatibles are OK,
Signature · 2 lines
-- 
2.41.0
#3 lore raw

PATCH 2/7 dt-bindings: remoteproc: qcom,msm8996-mss-pil: Fix 8996 clocks

In reply to Konrad Dybcio

Change RPMH to RPM (as RPMh was introduced 2 generations later) and drop the prng reference, which made ARRAY_SIZE(clocks) != ARRAY_SIZE(clock-names).

Fixes bdea142295ff ("dt-bindings: remoteproc: qcom,q6v5: Move MSM8996 to schema")
---
 .../devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml +3 -4
index c1ac6ca1e759..4e2358fea49e 100644
@@ -215,13 +215,12 @@ allOf:
             - description: GCC MSS IFACE clock
             - description: GCC MSS BUS clock
             - description: GCC MSS MEM clock
-            - description: RPMH XO clock
+            - description: RPM XO clock
             - description: GCC MSS GPLL0 clock
             - description: GCC MSS SNOC_AXI clock
             - description: GCC MSS MNOC_AXI clock
-            - description: RPMH PNOC clock
-            - description: GCC MSS PRNG clock
-            - description: RPMH QDSS clock
+            - description: RPM PNOC clock
+            - description: RPM QDSS clock
         clock-names:
           items:
             - const: iface
Signature · 1 line
2.41.0
maintainer Acked-by on v1 2/7
#4 lore raw

Re: [PATCH 2/7] dt-bindings: remoteproc: qcom,msm8996-mss-pil: Fix 8996 clocks

Quoted 9 lines · Konrad Dybcio

Change RPMH to RPM (as RPMh was introduced 2 generations later) and drop the prng reference, which made ARRAY_SIZE(clocks) != ARRAY_SIZE(clock-names).

Fixes bdea142295ff ("dt-bindings: remoteproc: qcom,q6v5: Move MSM8996 to schema")
---
 .../devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
#5 lore raw

PATCH 3/7 arm64: dts: qcom: pm6150l: Add missing short interrupt

In reply to Konrad Dybcio

Add the missing short interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['ovp'] is too short

Fixes fe508ced49dd ("arm64: dts: qcom: pm6150l: Add wled node")
---
 arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pm6150l.dtsi +3 -2
index 6a7fe1e59f15..d13a1ab7c20b 100644
@@ -121,8 +121,9 @@ pm6150l_flash: led-controller@d300 {
 		pm6150l_wled: leds@d800 {
 			compatible = "qcom,pm6150l-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "ovp";
+			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x5 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";
 			label = "backlight";
 
 			status = "disabled";
Signature · 1 line
2.41.0
#6 lore raw

Re: [PATCH 3/7] arm64: dts: qcom: pm6150l: Add missing short interrupt

Quoted 16 lines · On Montag, 26. Juni 2023 22:00:25 CEST Konrad Dybcio wrote:

Add the missing short interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['ovp'] is too short

Fixes fe508ced49dd ("arm64: dts: qcom: pm6150l: Add wled node")
---
 arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/qcom/pm6150l.dtsi index 6a7fe1e59f15..d13a1ab7c20b 100644

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 { · line 126

Quoted 8 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +3 -2
@@ -121,8 +121,9 @@ pm6150l_flash: led-controller@d300 {
 		pm6150l_wled: leds@d800 {
 			compatible = "qcom,pm6150l-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "ovp";
+			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x5 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";

Are you sure this interrupt really exists? It's not a thing used downstream at least:
https://android.googlesource.com/kernel/msm-extra/devicetree/+/refs/heads/android-msm-bramble-4.19-android11-qpr1/qcom/pm6150l.dtsi#293

Regards
Luca

Quoted 3 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -0
 			label = "backlight";
 
 			status = "disabled";
#7 lore raw

Re: [PATCH 3/7] arm64: dts: qcom: pm6150l: Add missing short interrupt

Quoted 21 lines · Luca Weiss
Quoted 20 lines · On Montag, 26. Juni 2023 22:00:25 CEST Konrad Dybcio wrote:

Add the missing short interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['ovp'] is too short

Fixes fe508ced49dd ("arm64: dts: qcom: pm6150l: Add wled node")
---
 arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/qcom/pm6150l.dtsi index 6a7fe1e59f15..d13a1ab7c20b 100644

arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -1
@@ -121,8 +121,9 @@ pm6150l_flash: led-controller@d300 {
 		pm6150l_wled: leds@d800 {
 			compatible = "qcom,pm6150l-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>;
Quoted 9 lines

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 { · line 126

Quoted 4 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +3 -1
-			interrupt-names = "ovp";
+			interrupts = <0x5 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x5 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";

Are you sure this interrupt really exists? It's not a thing used downstream at least:
https://android.googlesource.com/kernel/msm-extra/devicetree/+/refs/heads/android-msm-bramble-4.19-android11-qpr1/qcom/pm6150l.dtsi#293

Confirmed with a reliable source.

Konrad

Quoted 10 lines

Regards
Luca

Quoted 3 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -0
 			label = "backlight";
 
 			status = "disabled";
Reviewed-by
#8 lore raw

Re: [PATCH 3/7] arm64: dts: qcom: pm6150l: Add missing short interrupt

Quoted 20 lines · On Montag, 26. Juni 2023 22:18:11 CEST Konrad Dybcio wrote:
Quoted 19 lines · Luca Weiss
Quoted 18 lines · On Montag, 26. Juni 2023 22:00:25 CEST Konrad Dybcio wrote:

Add the missing short interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['ovp'] is too short

Fixes fe508ced49dd ("arm64: dts: qcom: pm6150l: Add wled node")

---

 arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/qcom/pm6150l.dtsi index 6a7fe1e59f15..d13a1ab7c20b 100644

arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -0
@@ -121,8 +121,9 @@ pm6150l_flash: led-controller@d300 {
 
Quoted 6 lines
Quoted 6 lines

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 {

Quoted 6 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -1
 		pm6150l_wled: leds@d800 {
 
 			compatible = "qcom,pm6150l-wled";
 			reg = <0xd800>, <0xd900>;
 
-			interrupts = <0x5 0xd8 0x1 

IRQ_TYPE_EDGE_RISING>;

Quoted 2 lines
Quoted 2 lines

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 { · line 127

Quoted 2 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +1 -1
-			interrupt-names = "ovp";
+			interrupts = <0x5 0xd8 0x1 

IRQ_TYPE_EDGE_RISING>,

Quoted 1 line
Quoted 1 line

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 { · line 128

Quoted 1 line
arch/arm64/boot/dts/qcom/pm6150l.dtsi +1 -0
+				     <0x5 0xd8 0x2 

IRQ_TYPE_EDGE_RISING>;

Quoted 7 lines
Quoted 6 lines

arch/arm64/boot/dts/qcom/pm6150l.dtsi pm6150l_flash: led-controller@d300 { · line 126

Quoted 1 line
arch/arm64/boot/dts/qcom/pm6150l.dtsi +1 -0
+			interrupt-names = "ovp", "short";

Are you sure this interrupt really exists? It's not a thing used downstream at least:
https://android.googlesource.com/kernel/msm-extra/devicetree/+/refs/heads/
android-msm-bramble-4.19-android11-qpr1/qcom/pm6150l.dtsi#293

Confirmed with a reliable source.

Fine by me then.

Quoted 9 lines

Konrad

Quoted 6 lines

Regards
Luca

Quoted 3 lines
arch/arm64/boot/dts/qcom/pm6150l.dtsi +0 -0
 			label = "backlight";
 
 			status = "disabled";
#9 lore raw

PATCH 4/7 arm64: dts: qcom: pm660l: Add missing short interrupt

In reply to Konrad Dybcio

Add the missing short interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['ovp'] is too short

Fixes 7b56a804e58b ("arm64: dts: qcom: pm660l: Add WLED support")
---
 arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pm660l.dtsi +3 -2
index 87b71b7205b8..6fdbf507c262 100644
@@ -74,8 +74,9 @@ pm660l_lpg: pwm {
 		pm660l_wled: leds@d800 {
 			compatible = "qcom,pm660l-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "ovp";
+			interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";
 			label = "backlight";
 
 			status = "disabled";
Signature · 1 line
2.41.0
#10 lore raw

PATCH 5/7 arm64: dts: qcom: pmi8950: Add missing OVP interrupt

In reply to Konrad Dybcio

Add the missing OVP interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['short'] is too short

Fixes 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral")
---
 arch/arm64/boot/dts/qcom/pmi8950.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pmi8950.dtsi +3 -2
index c09a9681bc0c..1029f3b1bb9a 100644
@@ -87,8 +87,9 @@ pmic@3 {
 		pmi8950_wled: leds@d800 {
 			compatible = "qcom,pmi8950-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <0x3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "short";
+			interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";
 			label = "backlight";
 
 			status = "disabled";
Signature · 1 line
2.41.0
#11 lore raw

PATCH 6/7 arm64: dts: qcom: pmi8994: Add missing OVP interrupt

In reply to Konrad Dybcio

Add the missing OVP interrupt. This fixes the schema warning:

wled@d800: interrupt-names: ['short'] is too short

Fixes 37aa540cbd30 ("arm64: dts: qcom: pmi8994: Add WLED node")
---
 arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pmi8994.dtsi +3 -2
index 0192968f4d9b..36d6a1fb553a 100644
@@ -54,8 +54,9 @@ pmi8994_spmi_regulators: regulators {
 		pmi8994_wled: wled@d800 {
 			compatible = "qcom,pmi8994-wled";
 			reg = <0xd800>, <0xd900>;
-			interrupts = <3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "short";
+			interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "ovp", "short";
 			qcom,cabc;
 			qcom,external-pfet;
 			status = "disabled";
Signature · 1 line
2.41.0
#12 lore raw

PATCH 7/7 arm64: dts: qcom: sc8180x: Add missing 'cache-unified' to L3

In reply to Konrad Dybcio

Add the missing property to fix the dt checker warning:

qcom/sc8180x-primus.dtb: l3-cache: 'cache-unified' is a required property

Fixes 8575f197b077 ("arm64: dts: qcom: Introduce the SC8180x platform")
---
 arch/arm64/boot/dts/qcom/sc8180x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +1 -0
index 204deefbfa8b..5d8303a8dc95 100644
@@ -64,6 +64,7 @@ L2_0: l2-cache {
 				L3_0: l3-cache {
 					compatible = "cache";
 					cache-level = <3>;
+					cache-unified;
 				};
 			};
 		};
Signature · 1 line
2.41.0
Reviewed-by on v1 7/7
#13 lore raw

Re: [PATCH 7/7] arm64: dts: qcom: sc8180x: Add missing 'cache-unified' to L3

Quoted 7 lines · Konrad Dybcio

Add the missing property to fix the dt checker warning:

qcom/sc8180x-primus.dtb: l3-cache: 'cache-unified' is a required property

Fixes 8575f197b077 ("arm64: dts: qcom: Introduce the SC8180x platform")

---

The last one, I hope...

Best regards,
Krzysztof

maintainer Applied
#14 lore raw

Re: (subset) [PATCH 0/7] random msm bindings fixes

In reply to Konrad Dybcio
Quoted 1 line · Konrad Dybcio

Applied, thanks!

[3/7] arm64: dts: qcom: pm6150l: Add missing short interrupt

      commit: 7e1f024ef0d1da456f61d00f01dc3287ede915b3
[4/7] arm64: dts: qcom: pm660l: Add missing short interrupt
      commit: 9a4ac09db3c7413e334b4abd6b2f6de8930dd781
[5/7] arm64: dts: qcom: pmi8950: Add missing OVP interrupt
      commit: 4d77b639531fd85b84a7079c3369908dfaddf8b2
[6/7] arm64: dts: qcom: pmi8994: Add missing OVP interrupt
      commit: 8db94432690371b1736e9a2566a9b3d8a73d5a97
[7/7] arm64: dts: qcom: sc8180x: Add missing 'cache-unified' to L3
      commit: e4322bb818bbcd36b441de9880fa4ac911a5eb51

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>
maintainer Applied
#15 lore raw

Re: (subset) [PATCH 0/7] random msm bindings fixes

In reply to Konrad Dybcio
Quoted 1 line · Konrad Dybcio

Applied, thanks!

[2/7] dt-bindings: remoteproc: qcom,msm8996-mss-pil: Fix 8996 clocks

      commit: 7784311cad42e67a1a51a9d1b961752c0f9b7200

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>
maintainer Applied
#16 lore raw

Re: (subset) [PATCH 0/7] random msm bindings fixes

In reply to Konrad Dybcio
Quoted 1 line · Konrad Dybcio

Applied, thanks!

[1/7] dt-bindings: qcom: Allow SoC names ending in "pro"

      commit: e40266d90545ef11f95832177faedf41eadcc453

Best regards,

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