Commit 4a3b1007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control updates from Linus Walleij:
 "We have some patches to DTS[I] files in arm and arm64 as well, that
  were merged here as DT headers were being changed.

  The most interesting stuff is the Intel Tangier chip support and
  AMLogic C3 in my opinion.

  No core changes this time.

  Drivers:

   - Intel Tangier SoC pin control support

   - AMLogic C3 SoC pin control support

   - Texas Instruments AM654 SoC pin control support

   - Qualcomm SM8350 and SM6115 LPASS (Low Power Audio Sub-System) pin
     control support

   - Qualcomm PMX75 and PM7550BA (Power Management) pin control support

   - Qualcomm PMC8180 and PMC8180C (Power Management) pin control
     support

   - DROP the Oxnas driver as there is not enough of community interest
     to keep carrying this ARM(11) port

  Enhancements:

   - Bias control in the MT7986 pin control driver

   - Misc device tree binding enhancements such as the Broadcom 11351
     being converted to YAML

   - New macro: DEFINE_NOIRQ_DEV_PM_OPS() put to use

   - Clean up some SPDX headers

   - Handle non-unique devicetree subnode names in two Renesas drivers"

* tag 'pinctrl-v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (80 commits)
  pinctrl: mlxbf3: Remove gpio_disable_free()
  pinctrl: use capital "OR" for multiple licenses in SPDX
  dt-bindings: pinctrl: renesas,rza2: Use 'additionalProperties' for child nodes
  pinctrl: cherryview: fix address_space_handler() argument
  pinctrl: intel: consolidate ACPI dependency
  pinctrl: tegra: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
  pinctrl: renesas: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
  pinctrl: mvebu: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
  pinctrl: at91: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
  pinctrl: cherryview: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
  pm: Introduce DEFINE_NOIRQ_DEV_PM_OPS() helper
  pinctrl: mediatek: assign functions to configure pin bias on MT7986
  pinctrl: mediatek: fix pull_type data for MT7981
  dt-bindings: pinctrl: aspeed: Allow only defined pin mux node properties
  dt-bindings: pinctrl: Drop 'phandle' properties
  pinctrl: lynxpoint: Make use of pm_ptr()
  pinctrl: baytrail: Make use of pm_ptr()
  pinctrl: intel: Switch to use exported namespace
  pinctrl: lynxpoint: reuse common functions from pinctrl-intel
  pinctrl: cherryview: reuse common functions from pinctrl-intel
  ...
parents bb511d4b 82a65f08

Documentation/devicetree/bindings/arm/omap/ctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ control module driver itself. 


See [2] for documentation about clock/clockdomain nodes.



[1] Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt

[1] Documentation/devicetree/bindings/pinctrl/pinctrl-single.yaml

[2] Documentation/devicetree/bindings/clock/ti/*



Required properties:

Documentation/devicetree/bindings/gpio/gpio_oxnas.txt

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
* Oxford Semiconductor OXNAS SoC GPIO Controller



Please refer to gpio.txt for generic information regarding GPIO bindings.



Required properties:

 - compatible: "oxsemi,ox810se-gpio" or "oxsemi,ox820-gpio"

 - reg: Base address and length for the device.

 - interrupts: The port interrupt shared by all pins.

 - gpio-controller: Marks the port as GPIO controller.

 - #gpio-cells: Two. The first cell is the pin number and

   the second cell is used to specify the gpio polarity as defined in

   defined in <dt-bindings/gpio/gpio.h>:

      0 = GPIO_ACTIVE_HIGH

      1 = GPIO_ACTIVE_LOW

 - interrupt-controller: Marks the device node as an interrupt controller.

 - #interrupt-cells: Two. The first cell is the GPIO number and second cell

   is used to specify the trigger type as defined in

   <dt-bindings/interrupt-controller/irq.h>:

      IRQ_TYPE_EDGE_RISING

      IRQ_TYPE_EDGE_FALLING

      IRQ_TYPE_EDGE_BOTH

 - gpio-ranges: Interaction with the PINCTRL subsystem, it also specifies the

   gpio base and count, should be in the format of numeric-gpio-range as

   specified in the gpio.txt file.



Example:



gpio0: gpio@0 {

	compatible = "oxsemi,ox810se-gpio";

	reg = <0x000000 0x100000>;

	interrupts = <21>;

	#gpio-cells = <2>;

	gpio-controller;

	interrupt-controller;

	#interrupt-cells = <2>;

	gpio-ranges = <&pinctrl 0 0 32>;

};



keys {

	...



	button-esc {

		label = "ESC";

		linux,code = <1>;

		gpios = <&gpio0 12 0>;

	};

};

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ allOf: 
properties:

  compatible:

    enum:

      - amlogic,c3-periphs-pinctrl

      - amlogic,meson-a1-periphs-pinctrl

      - amlogic,meson-s4-periphs-pinctrl
@@ -36,6 +37,10 @@ patternProperties: 
          - const: mux

          - const: gpio



      gpio-line-names:

        minItems: 62 # A1

        maxItems: 82 # S4



unevaluatedProperties:

  type: object

  $ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ $defs: 
      gpio-ranges:

        maxItems: 1



    patternProperties:

      "^.+-hog(-[0-9]+)?$":

        type: object



        required:

          - gpio-hog



    required:

      - reg

      - reg-names

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ patternProperties: 
          - const: ds

          - const: gpio



      gpio-line-names:

        maxItems: 15



unevaluatedProperties:

  type: object

  $ref: amlogic,meson-pinctrl-common.yaml#/$defs/meson-pins