Commit b67b3813 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'qcom-pinctrl-6.4' of... 

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

Qualcomm pinctrl Devicetree bindings changes for v6.4

Cleanup and improvement of the bindings to use "unevaluatedProperties"
instead of "additionalProperties", which allows to accept all the
properties already parsed by referenced common qcom,tlmm-common.yaml
schema.

That common qcom,tlmm-common.yaml binding is going to remove
"input-enable" property, thus using "unevaluatedProperties" allows such
change to propagate to other bindings automatically.
parents 86169e65 152674ab

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

+1 −10
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ $defs: 
      Pinctrl node's client devices use subnodes for desired pin configuration.

      Client device subnodes use below standard properties.

    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state

    unevaluatedProperties: false



    properties:

      pins:
@@ -92,19 +93,9 @@ $defs: 
                rx1, sdc_data, sdc_clk, sdc_cmd, tsens_max, wci_txd, wci_rxd,

                wsi_clk, wsi_clk3, wsi_data, wsi_data3, wsis_reset, xfem ]



      bias-pull-down: true

      bias-pull-up: true

      bias-disable: true

      drive-strength: true

      input-enable: true

      output-high: true

      output-low: true



    required:

      - pins



    additionalProperties: false



required:

  - compatible

  - reg

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

+1 −9
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ $defs: 
      Pinctrl node's client devices use subnodes for desired pin configuration.

      Client device subnodes use below standard properties.

    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state

    unevaluatedProperties: false



    properties:

      pins:
@@ -89,18 +90,9 @@ $defs: 
                sd_write, sec_mi2s, smb_int, ssbi_wtr0, ssbi_wtr1, uim1, uim2,

                uim3, uim_batt, wcss_bt, wcss_fm, wcss_wlan, webcam1_rst ]



      bias-pull-down: true

      bias-pull-up: true

      bias-disable: true

      drive-strength: true

      output-high: true

      output-low: true



    required:

      - pins



    additionalProperties: false



allOf:

  - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#

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

+1 −10
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ $defs: 
      Pinctrl node's client devices use subnodes for desired pin configuration.

      Client device subnodes use below standard properties.

    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state

    unevaluatedProperties: false



    properties:

      pins:
@@ -92,19 +93,9 @@ $defs: 
                qdss_tracedata_b, qpic, rx0, rx1, rx2, sd_card, sd_write,

                tsens_max, wci2a, wci2b, wci2c, wci2d ]



      bias-pull-down: true

      bias-pull-up: true

      bias-disable: true

      drive-strength: true

      input-enable: true

      output-high: true

      output-low: true



    required:

      - pins



    additionalProperties: false



allOf:

  - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#

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

+1 −10
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ $defs: 
      Pinctrl node's client devices use subnodes for desired pin configuration.

      Client device subnodes use below standard properties.

    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state

    unevaluatedProperties: false



    properties:

      pins:
@@ -105,19 +106,9 @@ $defs: 
                uim1_clk, uim1_data, uim1_present, uim1_reset, uim2_clk,

                uim2_data, uim2_present, uim2_reset, uim_batt, wlan_en1, ]



      bias-disable: true

      bias-pull-down: true

      bias-pull-up: true

      drive-strength: true

      input-enable: true

      output-high: true

      output-low: true



    required:

      - pins



    additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

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

+1 −10
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ $defs: 
      Pinctrl node's client devices use subnodes for desired pin configuration.

      Client device subnodes use below standard properties.

    $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state

    unevaluatedProperties: false



    properties:

      pins:
@@ -70,19 +71,9 @@ $defs: 
        enum: [ gpio, gsbi2_i2c, gsbi3, gsbi4, gsbi5_i2c, gsbi5_uart,

                sdc2, ebi2_lcdc, ps_hold, prim_audio, sec_audio, cdc_mclk, ]



      bias-disable: true

      bias-pull-down: true

      bias-pull-up: true

      drive-strength: true

      output-high: true

      output-low: true

      input-enable: true



    required:

      - pins



    additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>