Skip to contentSkip to conversation

mfd/phy/remoteproc: dt-bindings: syscon: be specific

PATCH Applied Krzysztof Kozlowski 5 participants 11 messages Aug 17, 2022 – Sep 12, 2022

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

cover mfd/phy/remoteproc: dt-bindings: syscon: be specific

Hi,

The last MFD/syscon patch depends on the previous ones to avoid dt_binding_check warnings.

I propose to take entire set via Rob's DT tree.

Best regards,
Krzysztof

Krzysztof Kozlowski (4):
dt-bindings: phy: hisilicon,hi3660-usb3: simplify example
dt-bindings: phy: hisilicon,hi3670-usb3: simplify example
dt-bindings: remoteproc: qcom,pil-info: add missing imem compatible
dt-bindings: mfd: syscon: require specific compatible also for
simple-mfd

 .../devicetree/bindings/mfd/syscon.yaml       | 14 +++++++++-
 .../bindings/phy/hisilicon,hi3660-usb3.yaml   | 22 +++++-----------
 .../bindings/phy/hisilicon,hi3670-usb3.yaml   | 26 ++++++-------------
 .../bindings/remoteproc/qcom,pil-info.yaml    |  2 +-
 4 files changed, 28 insertions(+), 36 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/4 dt-bindings: phy: hisilicon,hi3660-usb3: simplify example

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

---
 .../bindings/phy/hisilicon,hi3660-usb3.yaml   | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)
Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml +6 -16
index c2e073e26190..20b79e2e8b82 100644
@@ -41,20 +41,10 @@ additionalProperties: false
 
 examples:
   - |
-    bus {
-      #address-cells = <2>;
-      #size-cells = <2>;
-
-      usb3_otg_bc: usb3_otg_bc@ff200000 {
-        compatible = "syscon", "simple-mfd";
-        reg = <0x0 0xff200000 0x0 0x1000>;
-
-        usb-phy {
-          compatible = "hisilicon,hi3660-usb-phy";
-          #phy-cells = <0>;
-          hisilicon,pericrg-syscon = <&crg_ctrl>;
-          hisilicon,pctrl-syscon = <&pctrl>;
-          hisilicon,eye-diagram-param = <0x22466e4>;
-        };
-      };
+    usb-phy {
+        compatible = "hisilicon,hi3660-usb-phy";
+        #phy-cells = <0>;
+        hisilicon,pericrg-syscon = <&crg_ctrl>;
+        hisilicon,pctrl-syscon = <&pctrl>;
+        hisilicon,eye-diagram-param = <0x22466e4>;
     };
Signature · 1 line
2.34.1
maintainer Acked-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] dt-bindings: phy: hisilicon,hi3660-usb3: simplify example

Quoted 2 lines · Krzysztof Kozlowski

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

Signature · 1 line
~Vinod
maintainer Acked-by on v1 1/4
#3 lore raw

Re: [PATCH 1/4] dt-bindings: phy: hisilicon,hi3660-usb3: simplify example

In reply to Krzysztof Kozlowski

Em Wed, 17 Aug 2022 17:22:43 +0300
Krzysztof Kozlowski <[email protected]> escreveu:

Quoted 29 lines

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

---
 .../bindings/phy/hisilicon,hi3660-usb3.yaml   | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)
Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml +0 -13
index c2e073e26190..20b79e2e8b82 100644
@@ -41,20 +41,10 @@ additionalProperties: false
 
 examples:
   - |
-    bus {
-      #address-cells = <2>;
-      #size-cells = <2>;
-
-      usb3_otg_bc: usb3_otg_bc@ff200000 {
-        compatible = "syscon", "simple-mfd";
-        reg = <0x0 0xff200000 0x0 0x1000>;
-
-        usb-phy {
-          compatible = "hisilicon,hi3660-usb-phy";
-          #phy-cells = <0>;
-          hisilicon,pericrg-syscon = <&crg_ctrl>;
-          hisilicon,pctrl-syscon = <&pctrl>;

Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml additionalProperties: false · line 50

Quoted 10 lines
Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml +6 -3
-          hisilicon,eye-diagram-param = <0x22466e4>;
-        };
-      };
+    usb-phy {
+        compatible = "hisilicon,hi3660-usb-phy";
+        #phy-cells = <0>;
+        hisilicon,pericrg-syscon = <&crg_ctrl>;
+        hisilicon,pctrl-syscon = <&pctrl>;
+        hisilicon,eye-diagram-param = <0x22466e4>;
     };

Thanks,
Mauro

#4 lore raw

PATCH 2/4 dt-bindings: phy: hisilicon,hi3670-usb3: simplify example

In reply to Krzysztof Kozlowski

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

---
 .../bindings/phy/hisilicon,hi3670-usb3.yaml   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml +8 -18
index ebd78acfe2de..1cb00dbcd4c5 100644
@@ -52,22 +52,12 @@ additionalProperties: false
 
 examples:
   - |
-    bus {
-      #address-cells = <2>;
-      #size-cells = <2>;
-
-      usb3_otg_bc: usb3_otg_bc@ff200000 {
-        compatible = "syscon", "simple-mfd";
-        reg = <0x0 0xff200000 0x0 0x1000>;
-
-        usb_phy {
-          compatible = "hisilicon,hi3670-usb-phy";
-          #phy-cells = <0>;
-          hisilicon,pericrg-syscon = <&crg_ctrl>;
-          hisilicon,pctrl-syscon = <&pctrl>;
-          hisilicon,sctrl-syscon = <&sctrl>;
-          hisilicon,eye-diagram-param = <0xfdfee4>;
-          hisilicon,tx-vboost-lvl = <0x5>;
-        };
-      };
+    usb-phy {
+        compatible = "hisilicon,hi3670-usb-phy";
+        #phy-cells = <0>;
+        hisilicon,pericrg-syscon = <&crg_ctrl>;
+        hisilicon,pctrl-syscon = <&pctrl>;
+        hisilicon,sctrl-syscon = <&sctrl>;
+        hisilicon,eye-diagram-param = <0xfdfee4>;
+        hisilicon,tx-vboost-lvl = <0x5>;
     };
Signature · 1 line
2.34.1
maintainer Acked-by on v1 2/4
#5 lore raw

Re: [PATCH 2/4] dt-bindings: phy: hisilicon,hi3670-usb3: simplify example

Quoted 2 lines · Krzysztof Kozlowski

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

Signature · 6 lines
~Vinod

-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
maintainer Acked-by on v1 2/4
#6 lore raw

Re: [PATCH 2/4] dt-bindings: phy: hisilicon,hi3670-usb3: simplify example

In reply to Krzysztof Kozlowski

Em Wed, 17 Aug 2022 17:22:44 +0300
Krzysztof Kozlowski <[email protected]> escreveu:

Quoted 33 lines

syscon and simple-mfd cannot be used without device specific compatible, so simplify the example to fix this.

---
 .../bindings/phy/hisilicon,hi3670-usb3.yaml   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml +0 -17
index ebd78acfe2de..1cb00dbcd4c5 100644
@@ -52,22 +52,12 @@ additionalProperties: false
 
 examples:
   - |
-    bus {
-      #address-cells = <2>;
-      #size-cells = <2>;
-
-      usb3_otg_bc: usb3_otg_bc@ff200000 {
-        compatible = "syscon", "simple-mfd";
-        reg = <0x0 0xff200000 0x0 0x1000>;
-
-        usb_phy {
-          compatible = "hisilicon,hi3670-usb-phy";
-          #phy-cells = <0>;
-          hisilicon,pericrg-syscon = <&crg_ctrl>;
-          hisilicon,pctrl-syscon = <&pctrl>;
-          hisilicon,sctrl-syscon = <&sctrl>;
-          hisilicon,eye-diagram-param = <0xfdfee4>;
-          hisilicon,tx-vboost-lvl = <0x5>;
-        };

Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml additionalProperties: false · line 63

Quoted 10 lines
Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml +8 -1
-      };
+    usb-phy {
+        compatible = "hisilicon,hi3670-usb-phy";
+        #phy-cells = <0>;
+        hisilicon,pericrg-syscon = <&crg_ctrl>;
+        hisilicon,pctrl-syscon = <&pctrl>;
+        hisilicon,sctrl-syscon = <&sctrl>;
+        hisilicon,eye-diagram-param = <0xfdfee4>;
+        hisilicon,tx-vboost-lvl = <0x5>;
     };

Thanks,
Mauro

#7 lore raw

PATCH 3/4 dt-bindings: remoteproc: qcom,pil-info: add missing imem compatible

In reply to Krzysztof Kozlowski

syscon and simple-mfd cannot be used without device specific compatible.

---
 Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml +1 -1
index 9282837d64ba..a7711e3c998c 100644
@@ -30,7 +30,7 @@ additionalProperties: false
 examples:
   - |
     imem@146bf000 {
-      compatible = "syscon", "simple-mfd";
+      compatible = "qcom,sdm630-imem", "syscon", "simple-mfd";
       reg = <0x146bf000 0x1000>;
 
       #address-cells = <1>;
Signature · 1 line
2.34.1
#8 lore raw

PATCH 4/4 dt-bindings: mfd: syscon: require specific compatible also for simple-mfd

In reply to Krzysztof Kozlowski

The syscon bindings require a device specific compatible, beside the "syscon". However schema counts "simple-mfd" as such, which allows simple-mfd+syscon to sneak in.

Adjust the match to be sure simple-mfd also comes with a device specific compatible.

---
 Documentation/devicetree/bindings/mfd/syscon.yaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mfd/syscon.yaml +13 -1
index c958086a5fc3..a64c7a71e6fe 100644
@@ -72,7 +72,7 @@ properties:
       - contains:
           const: syscon
         minItems: 2
-        maxItems: 4  # Should be enough
+        maxItems: 5  # Should be enough
 
   reg:
     maxItems: 1
@@ -93,6 +93,18 @@ required:
   - compatible
   - reg
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: simple-mfd
+    then:
+      properties:
+        compatible:
+          minItems: 3
+          maxItems: 5
+
 additionalProperties: true
 
 examples:
Signature · 7 lines
2.34.1


-- 
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
maintainer Applied
#9 lore raw

Re: [PATCH 4/4] dt-bindings: mfd: syscon: require specific compatible also for simple-mfd

Quoted 11 lines · Krzysztof Kozlowski

The syscon bindings require a device specific compatible, beside the "syscon". However schema counts "simple-mfd" as such, which allows simple-mfd+syscon to sneak in.

Adjust the match to be sure simple-mfd also comes with a device specific compatible.

---
 Documentation/devicetree/bindings/mfd/syscon.yaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Applied, thanks.

Signature · 1 line
Lee Jones [李琼斯]
maintainer Applied
#10 lore raw
In reply to Krzysztof Kozlowski
Quoted 6 lines · Krzysztof Kozlowski

Hi,

The last MFD/syscon patch depends on the previous ones to avoid dt_binding_check warnings.

I propose to take entire set via Rob's DT tree.

This may have been in the window where PW server moved and stopped getting patches, so I missed it until patch 4 got applied and broke linux-next...

Quoted 10 lines

Best regards,
Krzysztof

Krzysztof Kozlowski (4):
dt-bindings: phy: hisilicon,hi3660-usb3: simplify example
dt-bindings: phy: hisilicon,hi3670-usb3: simplify example
dt-bindings: remoteproc: qcom,pil-info: add missing imem compatible
dt-bindings: mfd: syscon: require specific compatible also for
simple-mfd

I applied patches 1-3, thanks!

Rob

Signature · 3 lines
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy