Commit 1ec033f0 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'qcom-pinctrl-6.3-2' of... 

Merge tag 'qcom-pinctrl-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into devel

Qualcomm pinctrl Devicetree bindings changes for v6.3, part two

Several minor cleanups and fixes on Qualcomm pin controller Devicetree
bindings - add missing input-disable, correct GPIO pin name patterns in
bindings, correct number of GPIOs in gpio-ranges property.
parents 6c83b2d9 315dffb8

Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ $defs: 
          subnode.

        items:

          oneOf:

            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-1][0-6])$"

            - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-6])$"

            - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data ]

        minItems: 1

        maxItems: 36

Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ $defs: 
          subnode.

        items:

          oneOf:

            - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-7])$"

            - pattern: "^gpio([0-9]|[1-9][0-9]|10[0-9]|11[0-2])$"

            - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd,

                      sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0, qdsd_data1,

                      qdsd_data2, qdsd_data3 ]
@@ -127,7 +127,7 @@ examples: 
        interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

        gpio-controller;

        #gpio-cells = <2>;

        gpio-ranges = <&tlmm 0 0 117>;

        gpio-ranges = <&tlmm 0 0 113>;

        interrupt-controller;

        #interrupt-cells = <2>;

Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ $defs: 
          subnode.

        items:

          oneOf:

            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-7][0-9])$"

            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[01])$"

            - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,

                      sdc2_cmd, sdc2_data, qdsd_clk, qdsd_cmd, qdsd_data0,

                      qdsd_data1, qdsd_data2, qdsd_data3 ]

Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml

+3 −3
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ properties: 


  gpio-reserved-ranges:

    minItems: 1

    maxItems: 75

    maxItems: 73



  gpio-line-names:

    maxItems: 150

    maxItems: 146



patternProperties:

  "-state$":
@@ -63,7 +63,7 @@ $defs: 
          subnode.

        items:

          oneOf:

            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-4][0-9])$"

            - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[0-5])$"

            - enum: [ sdc1_clk, sdc1_cmd, sdc1_data, sdc1_rclk, sdc2_clk,

                      sdc2_cmd, sdc2_data, sdc3_clk, sdc3_cmd, sdc3_data ]

        minItems: 1

Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $defs: 
          subnode.

        items:

          oneOf:

            - pattern: "^gpio([0-9]|[1-9][0-9])$"

            - pattern: "^gpio([0-9]|1[0-4])$"

        minItems: 1

        maxItems: 15