Commit 46a1daac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v7.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control updates from Linus Walleij:
 "Core changes:

   - Drop the unused devm_pinctrl_unregister() function

   - Move pretended generic pin control functionality out of the core
     and into the Amlogic AM4 driver. We have something better coming
     (hopefully)

  New hardware support:

   - Spacemit K3 (RISC-V) pin control support

   - Atmel AT91 PIO4 (ARM32) SAMA7D65 pin control support

   - Exynos9610 (ARM64) pin control support

   - Qualcomm Mahua TLMM (ARM64) pin control support

   - Microchip Polarfire MSSIO (RISC-V) pin control support

   - Ocelot LAN9645XF (multiplatform) pin control support

  Improvements:

   - Using a few more guards for locking

   - Various nonurgent fixes and tweaks"

* tag 'pinctrl-v7.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (73 commits)
  pinctrl: generic: move function to amlogic-am4 driver
  pinctrl: intel: Align Copyright note with corporate guidelines
  pinctrl: mediatek: remove unused drv_offset field
  pinctrl: canaan: k230: Fix NULL pointer dereference when parsing devicetree
  pinctrl: single: fix refcount leak in pcs_add_gpio_func()
  pinctrl: meson: amlogic-a4: Fix device node reference leak in bank helpers
  pinctrl: qcom: sm8250-lpass-lpi: Fix i2s2_data_groups definition
  pinctrl: core: Remove duplicate error messages
  pinctrl: core: Simplify devm_pinctrl_*()
  pinctrl: core: Remove unused devm_pinctrl_unregister()
  dt-bindings: pinctrl: spacemit: fix drive-strength check warning
  pinctrl: fix kismet issues with GENERIC_PINCTRL
  pinctrl: tangier: Join tng_pinctrl_probe() into its wrapper
  pinctrl: tangier: Remove duplicate error messages
  pinctrl: lynxpoint: Remove duplicate error messages
  pinctrl: cherryview: Remove duplicate error messages
  pinctrl: baytrail: Remove duplicate error messages
  pinctrl: intel: Remove duplicate error messages
  pinctrl: equilibrium: Fix device node reference leak in pinbank_init()
  dt-bindings: pinctrl: pinctrl-microchip-sgpio: add LAN969x
  ...
parents 6086f349 9c5a40f2

Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ patternProperties: 
  #     the pin numbers then,

  #   - Finally, the name will end with either -pin or pins.



  "^([rs]-)?(([a-z0-9]{3,}|[a-oq-z][a-z0-9]*?)?-)+?(p[a-ilm][0-9]*?-)??pins?$":

  "^([rs]-)?(([a-z0-9]{3,}|[a-oq-z0-9][a-z0-9]*?)?-)+?(p[a-ilm][0-9]*?-)??pins?$":

    type: object



    properties:

Documentation/devicetree/bindings/pinctrl/microchip,mpfs-pinctrl-mssio.yaml

0 → 100644
+109 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/pinctrl/microchip,mpfs-pinctrl-mssio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Microchip Polarfire SoC MSSIO pinctrl



maintainers:

  - Conor Dooley <conor.dooley@microchip.com>



properties:

  compatible:

    oneOf:

      - const: microchip,mpfs-pinctrl-mssio

      - items:

          - const: microchip,pic64gx-pinctrl-mssio

          - const: microchip,mpfs-pinctrl-mssio



  reg:

    maxItems: 1



  pinctrl-use-default: true



patternProperties:

  '-cfg$':

    type: object

    additionalProperties: false



    patternProperties:

      '-pins$':

        type: object

        additionalProperties: false



        allOf:

          - $ref: pincfg-node.yaml#

          - $ref: pinmux-node.yaml#



        properties:

          pins:

            description:

              The list of IOs that properties in the pincfg node apply to.



          function:

            description:

              A string containing the name of the function to mux for these

              pins. The "reserved" function tristates a pin.

            enum: [ sd, emmc, qspi, spi, usb, uart, i2c, can, mdio, misc

                    reserved, gpio, fabric-test, tied-low, tied-high, tristate ]



          bias-bus-hold: true

          bias-disable: true

          bias-pull-down: true

          bias-pull-up: true

          input-schmitt-enable: true

          low-power-enable: true



          drive-strength:

            enum: [ 2, 4, 6, 8, 10, 12, 16, 20 ]



          power-source:

            description:

              Which bank voltage to use. This cannot differ for pins in a

              given bank, the whole bank uses the same voltage.

            enum: [ 1200000, 1500000, 1800000, 2500000, 3300000 ]



          microchip,clamp-diode:

            $ref: /schemas/types.yaml#/definitions/flag

            description:

              Reflects the "Clamp Diode" setting in the MSS Configurator for

              this pin. This setting controls whether or not input voltage

              clamping should be enabled.



          microchip,ibufmd:

            $ref: /schemas/types.yaml#/definitions/uint32

            default: 0

            description:

              Reflects the "IBUFMD" bits in the MSS Configurator output files

              for this pin.



        required:

          - pins

          - function

          - power-source



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    pinctrl@204 {

      compatible = "microchip,mpfs-pinctrl-mssio";

      reg = <0x204 0x7c>;



      ikrd-spi1-cfg {

        spi1-pins {

          pins = <30>, <31>, <32>, <33>;

          function = "spi";

          bias-pull-up;

          drive-strength = <8>;

          power-source = <3300000>;

          microchip,ibufmd = <0x1>;

        };

      };

    };

...

Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml

+15 −5
Original line number Diff line number Diff line
@@ -21,10 +21,15 @@ properties: 
    pattern: '^gpio@[0-9a-f]+$'



  compatible:

    enum:

    oneOf:

      - enum:

          - microchip,sparx5-sgpio

          - mscc,ocelot-sgpio

          - mscc,luton-sgpio

      - items:

          - enum:

              - microchip,lan9691-sgpio

          - const: microchip,sparx5-sgpio



  '#address-cells':

    const: 1
@@ -80,7 +85,12 @@ patternProperties: 
    type: object

    properties:

      compatible:

        const: microchip,sparx5-sgpio-bank

        oneOf:

          - items:

              - enum:

                  - microchip,lan9691-sgpio-bank

              - const: microchip,sparx5-sgpio-bank

          - const: microchip,sparx5-sgpio-bank



      reg:

        description: |

Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
  compatible:

    oneOf:

      - enum:

          - microchip,lan96455f-pinctrl

          - microchip,lan966x-pinctrl

          - microchip,lan9691-pinctrl

          - microchip,sparx5-pinctrl
@@ -30,6 +31,11 @@ properties: 
              - microchip,lan9693-pinctrl

              - microchip,lan9692-pinctrl

          - const: microchip,lan9691-pinctrl

      - items:

          - enum:

              - microchip,lan96457f-pinctrl

              - microchip,lan96459f-pinctrl

          - const: microchip,lan96455f-pinctrl



  reg:

    items:

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

+4 −2
Original line number Diff line number Diff line
@@ -10,14 +10,16 @@ maintainers: 
  - Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>



description:

  Top Level Mode Multiplexer pin controller in Qualcomm Glymur SoC.

  Top Level Mode Multiplexer pin controller in Qualcomm Glymur and Mahua SoC.



allOf:

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



properties:

  compatible:

    const: qcom,glymur-tlmm

    enum:

      - qcom,glymur-tlmm

      - qcom,mahua-tlmm



  reg:

    maxItems: 1