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

Commit 54e2602f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'ib-sx150x' of /home/linus/linux-pinctrl into devel

parents f08ea3cc 9e80f906

Documentation/devicetree/bindings/gpio/gpio-sx150x.txt→Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt

+69 −0
Original line number Diff line number Diff line 
SEMTECH SX150x GPIO expander bindings



Please refer to pinctrl-bindings.txt, ../gpio/gpio.txt, and

../interrupt-controller/interrupts.txt for generic information regarding

pin controller, GPIO, and interrupt bindings.



Required properties:



- compatible: should be "semtech,sx1506q",

- compatible: should be one of :

			"semtech,sx1506q",

			"semtech,sx1508q",

			"semtech,sx1509q",

			"semtech,sx1502q".



- reg: The I2C slave address for this device.



- interrupt-parent: phandle of the parent interrupt controller.



- interrupts: Interrupt specifier for the controllers interrupt.



- #gpio-cells: Should be 2. The first cell is the GPIO number and the

		second cell is used to specify optional parameters:

		bit 0: polarity (0: normal, 1: inverted)



- gpio-controller: Marks the device as a GPIO controller.



Optional properties :

- interrupt-parent: phandle of the parent interrupt controller.



- interrupts: Interrupt specifier for the controllers interrupt.



- interrupt-controller: Marks the device as a interrupt controller.



- semtech,probe-reset: Will trigger a reset of the GPIO expander on probe,

		only for sx1508q and sx1509q



The GPIO expander can optionally be used as an interrupt controller, in

which case it uses the default two cell specifier as described in

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.

which case it uses the default two cell specifier.



Required properties for pin configuration sub-nodes:

 - pins: List of pins to which the configuration applies.



Optional properties for pin configuration sub-nodes:

----------------------------------------------------

 - bias-disable: disable any pin bias, except the OSCIO pin

 - bias-pull-up: pull up the pin, except the OSCIO pin

 - bias-pull-down: pull down the pin, except the OSCIO pin

 - bias-pull-pin-default: use pin-default pull state, except the OSCIO pin

 - drive-push-pull: drive actively high and low

 - drive-open-drain: drive with open drain only for sx1508q and sx1509q and except the OSCIO pin

 - output-low: set the pin to output mode with low level

 - output-high: set the pin to output mode with high level



Example:



	i2c_gpio_expander@20{

	i2c0gpio-expander@20{

		#gpio-cells = <2>;

		#interrupt-cells = <2>;

		compatible = "semtech,sx1506q";
@@ -38,4 +58,12 @@ Example: 


		gpio-controller;

		interrupt-controller;



		pinctrl-names = "default";

		pinctrl-0 = <&gpio1_cfg_pins>;



		gpio1_cfg_pins: gpio1-cfg {

			pins = "gpio1";

			bias-pull-up;

		};

	};

drivers/gpio/Kconfig

+5 −8
Original line number Diff line number Diff line
@@ -781,16 +781,13 @@ config GPIO_PCF857X 
	  platform-neutral GPIO calls.



config GPIO_SX150X

	bool "Semtech SX150x I2C GPIO expander"

	depends on I2C=y

	select GPIOLIB_IRQCHIP

	bool "Semtech SX150x I2C GPIO expander (deprecated)"

	depends on PINCTRL && I2C=y

	select PINCTRL_SX150X

	default n

	help

	  Say yes here to provide support for Semtech SX150-series I2C

	  GPIO expanders. Compatible models include:



	  8 bits:  sx1508q

	  16 bits: sx1509q

	  Say yes here to provide support for Semtech SX150x-series I2C

	  GPIO expanders. The GPIO driver was replaced by a Pinctrl version.



config GPIO_TPIC2810

	tristate "TPIC2810 8-Bit I2C GPO expander"

drivers/gpio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ obj-$(CONFIG_GPIO_SPEAR_SPICS) += gpio-spear-spics.o 
obj-$(CONFIG_GPIO_STA2X11)	+= gpio-sta2x11.o

obj-$(CONFIG_GPIO_STMPE)	+= gpio-stmpe.o

obj-$(CONFIG_GPIO_STP_XWAY)	+= gpio-stp-xway.o

obj-$(CONFIG_GPIO_SX150X)	+= gpio-sx150x.o

obj-$(CONFIG_GPIO_SYSCON)	+= gpio-syscon.o

obj-$(CONFIG_GPIO_TB10X)	+= gpio-tb10x.o

obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o

drivers/gpio/gpio-sx150x.c

deleted100644 → 0
+0 −792

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -164,6 +164,20 @@ config PINCTRL_SIRF 
	select GENERIC_PINCONF

	select GPIOLIB_IRQCHIP



config PINCTRL_SX150X

	bool "Semtech SX150x I2C GPIO expander pinctrl driver"

	depends on GPIOLIB && I2C=y

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select GPIOLIB_IRQCHIP

	help

	  Say yes here to provide support for Semtech SX150x-series I2C

	  GPIO expanders as pinctrl module.

	  Compatible models include:

	  - 8 bits:  sx1508q, sx1502q

	  - 16 bits: sx1509q, sx1506q



config PINCTRL_PISTACHIO

	def_bool y if MACH_PISTACHIO

	depends on GPIOLIB