Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d5ba49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pinctrl updates from Linus Walleij:
 "Bulk pin control changes for the v4.10 kernel cycle:

  No core changes this time. Mainly gradual improvement and
  feature growth in the drivers.

  New drivers:

   - New driver for TI DA850/OMAP-L138/AM18XX pinconf

   - The SX150x was moved over from the GPIO subsystem and reimagined as
     a pin control driver with GPIO support in a joint effort by three
     independent users of this hardware. The result was amazingly good!

   - New subdriver for the Oxnas OX820

  Improvements:

   - The sunxi driver now supports the generic pin control bindings
     rather than the sunxi-specific. Add debouncing support to the
     driver.

   - Simplifications in pinctrl-single adding a generic parser.

   - Two downstream fixes and move the Raspberry Pi BCM2835 over to use
     the generic GPIOLIB_IRQCHIP"

* tag 'pinctrl-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (92 commits)
  pinctrl: sx150x: use new nested IRQ infrastructure
  pinctrl: sx150x: handle missing 'advanced' reg in sx1504 and sx1505
  pinctrl: sx150x: rename 'reg_advance' to 'reg_advanced'
  pinctrl: sx150x: access the correct bits in the 4-bit regs of sx150[147]
  pinctrl: mt8173: set GPIO16 to usb iddig mode
  pinctrl: bcm2835: switch to GPIOLIB_IRQCHIP
  pinctrl: New driver for TI DA850/OMAP-L138/AM18XX pinconf
  devicetree: bindings: pinctrl: Add binding for ti,da850-pupd
  Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition
  pinctrl: intel: set default handler to be handle_bad_irq()
  pinctrl: sx150x: add support for sx1501, sx1504, sx1505 and sx1507
  pinctrl: sx150x: sort chips by part number
  pinctrl: sx150x: use correct registers for reg_sense (sx1502 and sx1508)
  pinctrl: imx: fix imx_pinctrl_desc initialization
  pinctrl: sx150x: support setting multiple pins at once
  pinctrl: sx150x: various spelling fixes and some white-space cleanup
  pinctrl: mediatek: use builtin_platform_driver
  pinctrl: stm32: use builtin_platform_driver
  pinctrl: sunxi: Testing the wrong variable
  pinctrl: nomadik: split up and comments MC0 pins
  ...
parents 061ad503 f8214445

Documentation/devicetree/bindings/gpio/gpio_oxnas.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
Please refer to gpio.txt for generic information regarding GPIO bindings.



Required properties:

 - compatible: "oxsemi,ox810se-gpio"

 - 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.

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

+30 −0
Original line number Diff line number Diff line
@@ -28,6 +28,20 @@ Required properties: 
- reg: Should contain the register physical address and length for the

  pin controller.



- clocks: phandle to the clocks feeding the pin controller:

  - "apb": the gated APB parent clock

  - "hosc": the high frequency oscillator in the system

  - "losc": the low frequency oscillator in the system



Note: For backward compatibility reasons, the hosc and losc clocks are only

required if you need to use the optional input-debounce property. Any new

device tree should set them.



Optional properties:

  - input-debounce: Array of debouncing periods in microseconds. One period per

    irq bank found in the controller. 0 if no setup required.





Please refer to pinctrl-bindings.txt in this directory for details of the

common pinctrl bindings used by client devices.
@@ -37,6 +51,22 @@ pins it needs, and how they should be configured, with regard to muxer 
configuration, drive strength and pullups. If one of these options is

not set, its actual value will be unspecified.



This driver supports the generic pin multiplexing and configuration

bindings. For details on each properties, you can refer to

./pinctrl-bindings.txt.



Required sub-node properties:

  - pins

  - function



Optional sub-node properties:

  - bias-disable

  - bias-pull-up

  - bias-pull-down

  - drive-strength



*** Deprecated pin configuration and multiplexing binding



Required subnode-properties:



- allwinner,pins: List of strings containing the pin name.

Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ DRIVE_STRENGTH (3 << 5): indicate the drive strength of the pin using the 
				01 - Low

				10 - Medium

				11 - High

OUTPUT		(1 << 7): indicate this pin need to be configured as an output.

OUTPUT_VAL	(1 << 8): output val (1 = high, 0 = low)

DEBOUNCE	(1 << 16): indicate this pin needs debounce.

DEBOUNCE_VAL	(0x3fff << 17): debounce value.

Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Required properties for the root node: 
		      "amlogic,meson8b-aobus-pinctrl"

		      "amlogic,meson-gxbb-periphs-pinctrl"

		      "amlogic,meson-gxbb-aobus-pinctrl"

		      "amlogic,meson-gxl-periphs-pinctrl"

		      "amlogic,meson-gxl-aobus-pinctrl"

 - reg: address and size of registers controlling irq functionality



=== GPIO sub-nodes ===

Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ used for a specific device or function. This node represents configurations of 
pins, optional function, and optional mux related configuration.



Required properties for pin controller node:

 - compatible: "oxsemi,ox810se-pinctrl"

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

 - oxsemi,sys-ctrl: a phandle to the system controller syscon node



Required properties for pin configuration sub-nodes: