Commit 361c89a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control updates from Linus Walleij:
 "The two large chunks is the header clean-up from Andy and the Qualcomm
  DT bindings clean-up from Krzysztof. Each which could give rise to
  conflicts, but I haven't seen any.

  The YAML conversions happening around the device tree is the biggest
  item in the series and is the result of Rob Herrings ambition to
  autovalidate these trees against strict schemas and it is paying off
  in lots of bugs found and ever prettier device trees. Sooner or later
  the transition will be complete, Krzysztof is fixing up all of the
  Qualcomm stuff, which is pretty voluminous.

  Core changes:

   - minor but nice and important documentation clean-ups

  New drivers:

   - subdriver for the Qualcomm SDM670 SoC

   - subdriver for the Intel Moorefield SoC

   - trivial support for the NXP Freescale i.MXRT1170 SoC

  Other changes and improvements

   - major clean-up of the Qualcomm pin control device tree bindings by
     Krzysztof

   - major header clean-up by Andy

   - some immutable irqchip clean-up for the Actions Semiconductor and
     Nuvoton drivers

   - GPIO helpers for The Cypress cy8c95x0 driver

   - bias handling in the Mediatek MT7986 driver

   - remove the unused pins-are-numbered concept that never flew"

* tag 'pinctrl-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (231 commits)
  pinctrl: thunderbay: fix possible memory leak in thunderbay_build_functions()
  dt-bindings: pinctrl: st,stm32: Deprecate pins-are-numbered
  dt-bindings: pinctrl: mediatek,mt65xx: Deprecate pins-are-numbered
  pinctrl: stm32: Remove check for pins-are-numbered
  pinctrl: mediatek: common: Remove check for pins-are-numbered
  pinctrl: qcom: remove duplicate included header files
  pinctrl: sunxi: d1: Add CAN bus pinmuxes
  pinctrl: loongson2: Fix some const correctness
  pinctrl: pinconf-generic: add missing of_node_put()
  pinctrl: intel: Enumerate PWM device when community has a capability
  pwm: lpss: Rename pwm_lpss_probe() --> devm_pwm_lpss_probe()
  pwm: lpss: Allow other drivers to enable PWM LPSS
  pwm: lpss: Include headers we are the direct user of
  pwm: lpss: Rename MAX_PWMS --> LPSS_MAX_PWMS
  pwm: Add a stub for devm_pwmchip_add()
  pinctrl: k210: call of_node_put()
  pinctrl: starfive: Use existing variable gpio
  dt-bindings: pinctrl: semtech,sx150xq: fix match patterns for 16 GPIOs matching
  pinconf-generic: fix style issues in pin_config_param doc
  pinctrl: pinctrl-loongson2: fix Kconfig dependency
  ...
parents d0f3ad23 83e1bcaf

Documentation/devicetree/bindings/arm/fsl.yaml

+12 −0
Original line number Diff line number Diff line
@@ -1070,6 +1070,18 @@ properties: 
              - fsl,imx93-11x11-evk       # i.MX93 11x11 EVK Board

          - const: fsl,imx93



      - description: i.MXRT1050 based Boards

        items:

          - enum:

              - fsl,imxrt1050-evk         # i.MXRT1050 EVK Board

          - const: fsl,imxrt1050



      - description: i.MXRT1170 based Boards

        items:

          - enum:

              - fsl,imxrt1170-evk         # i.MXRT1170 EVK Board

          - const: fsl,imxrt1170



      - description:

          Freescale Vybrid Platform Device Tree Bindings

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ properties: 
          - const: fsl,imx8qxp-usdhc

          - const: fsl,imx7d-usdhc

        deprecated: true

      - items:

          - enum:

              - fsl,imxrt1170-usdhc

          - const: fsl,imxrt1050-usdhc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/pinctrl/fsl,imxrt1050.yaml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ patternProperties: 
          each entry consists of 6 integers and represents the mux and config

          setting for one pin. The first 5 integers <mux_reg conf_reg input_reg

          mux_val input_val> are specified using a PIN_FUNC_ID macro, which can

          be found in <include/dt-bindings/pinctrl/pins-imxrt1050.h>. The last

          be found in <arch/arm/boot/dts/imxrt1050-pinfunc.h>. The last

          integer CONFIG is the pad setting value like pull-up on this pin. Please

          refer to i.MXRT1050 Reference Manual for detailed CONFIG settings.

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

Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml

0 → 100644
+123 −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/loongson,ls2k-pinctrl.yaml#

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



title: Loongson-2 SoC Pinctrl Controller



maintainers:

  - zhanghongchen <zhanghongchen@loongson.cn>

  - Yinbo Zhu <zhuyinbo@loongson.cn>



allOf:

  - $ref: pinctrl.yaml#



properties:

  compatible:

    const: loongson,ls2k-pinctrl



  reg:

    maxItems: 1



patternProperties:

  '-pins$':

    type: object



    additionalProperties: false



    patternProperties:

      'pinmux$':

        type: object

        description: node for pinctrl.

        $ref: pinmux-node.yaml#



        unevaluatedProperties: false



        properties:

          groups:

            description:

              One or more groups of pins to mux to a certain function

            items:

              enum: [gpio, sdio, can1, can0, pwm3, pwm2, pwm1, pwm0, i2c1, i2c0,

                     nand, sata_led, i2s, hda]

          function:

            description:

              The function that a group of pins is muxed to

            enum: [gpio, sdio, can1, can0, pwm3, pwm2, pwm1, pwm0, i2c1, i2c0,

                   nand, sata_led, i2s, hda]



        required:

          - groups

          - function



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    pctrl: pinctrl@1fe00420 {

        compatible = "loongson,ls2k-pinctrl";

        reg = <0x1fe00420 0x18>;

        sdio_pins_default: sdio-pins {

            sdio-pinmux {

                groups = "sdio";

                function = "sdio";

            };



            sdio-det-pinmux {

                groups = "pwm2";

                function = "gpio";

            };

        };



        pwm1_pins_default: pwm1-pins {

            pinmux {

                groups = "pwm1";

                function = "pwm1";

            };

        };



        pwm0_pins_default: pwm0-pins {

            pinmux {

                groups = "pwm0";

                function = "pwm0";

            };

        };



        i2c1_pins_default: i2c1-pins {

            pinmux {

                groups = "i2c1";

                function = "i2c1";

            };

        };



        i2c0_pins_default: i2c0-pins {

            pinmux {

                groups = "i2c0";

                function = "i2c0";

            };

        };



        nand_pins_default: nand-pins {

            pinmux {

                groups = "nand";

                function = "nand";

            };

        };



        hda_pins_default: hda-pins {

            grp0-pinmux {

                groups = "hda";

                function = "hda";

            };



            grp1-pinmux {

                groups = "i2s";

                function = "gpio";

            };

        };

    };

Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ properties: 
  pins-are-numbered:

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

    description: |

      Specify the subnodes are using numbered pinmux to specify pins.

      Specify the subnodes are using numbered pinmux to specify pins. (UNUSED)

    deprecated: true



  gpio-controller: true
@@ -62,7 +63,6 @@ properties: 


required:

  - compatible

  - pins-are-numbered

  - gpio-controller

  - "#gpio-cells"
@@ -150,7 +150,6 @@ examples: 
          compatible = "mediatek,mt8135-pinctrl";

          reg = <0 0x1000B000 0 0x1000>;

          mediatek,pctl-regmap = <&syscfg_pctl_a>, <&syscfg_pctl_b>;

          pins-are-numbered;

          gpio-controller;

          #gpio-cells = <2>;

          interrupt-controller;