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

Commit dff8360a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO changes from Linus Walleij:
 "So this is the LW GPIO patch stack for v3.7:
   - refactoring from Thierry Redding at Arnd Bergmann's request to use
     the seq_file iterator interface in gpiolib.
   - A new driver for Avionic Design's N-bit GPIO expander.
   - Two instances of mutexes replaced by spinlocks from Axel Lin to
     code that is supposed to be fastpath compliant.
   - IRQ demuxer and gpio_to_irq() support for pcf857x by Kuninori
     Morimoto.
   - Dynamic GPIO numbers, device tree support, daisy chaining and some
     other fixes for the 74x164 driver by Maxime Ripard.
   - IRQ domain and device tree support for the tc3589x driver by Lee
     Jones.
   - Some conversion to use managed resources devm_* code.
   - Some instances of clk_prepare() or clk_prepare_enable() added to
     support the new, stricter common clock framework.
   - Some for_each_set_bit() simplifications.
   - Then a lot of fixes as we fixed up all of the above tripping over
     our own shoelaces and that kind of thing."

* tag 'gpio-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (34 commits)
  gpio: pcf857x: select IRQ_DOMAIN
  gpio: Document device_node's det_debounce
  gpio-lpc32xx: Add GPI_28
  gpio: adnp: dt: Reference generic interrupt binding
  gpio: Add Avionic Design N-bit GPIO expander support
  gpio: pxa: using for_each_set_bit to simplify the code
  gpio_msm: using for_each_set_bit to simplify the code
  gpio: Enable the tc3298x GPIO expander driver for Device Tree
  gpio: Provide the tc3589x GPIO expander driver with an IRQ domain
  ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled
  gpio: pcf857x: fixup smatch WARNING
  gpio: 74x164: Add support for the daisy-chaining
  gpio: 74x164: dts: Add documentation for the dt binding
  dt: Fix incorrect reference in gpio-led documentation
  gpio: 74x164: Add device tree support
  gpio: 74x164: Use dynamic gpio number assignment if no pdata is present
  gpio: 74x164: Use devm_kzalloc
  gpio: 74x164: Use module_spi_driver boiler plate function
  gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places
  gpio: em: Use irq_data_get_irq_chip_data() at appropriate places
  ...
parents 916082b0 901acf5b

Documentation/devicetree/bindings/gpio/gpio-74x164.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Generic 8-bits shift register GPIO driver



Required properties:

- compatible : Should be "fairchild,74hc595"

- reg : chip select number

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

- #gpio-cells : Should be two.  The first cell is the pin number and

  the second cell is used to specify the gpio polarity:

      0 = active high

      1 = active low

- registers-number: Number of daisy-chained shift registers



Example:



gpio5: gpio5@0 {

	compatible = "fairchild,74hc595";

	reg = <0>;

	gpio-controller;

	#gpio-cells = <2>;

	registers-number = <4>;

	spi-max-frequency = <100000>;

};

Documentation/devicetree/bindings/gpio/gpio-adnp.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Avionic Design N-bit GPIO expander bindings



Required properties:

- compatible: should be "ad,gpio-adnp"

- 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

- nr-gpios: The number of pins supported by the controller.



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.



Example:



	gpioext: gpio-controller@41 {

		compatible = "ad,gpio-adnp";

		reg = <0x41>;



		interrupt-parent = <&gpio>;

		interrupts = <160 1>;



		gpio-controller;

		#gpio-cells = <2>;



		interrupt-controller;

		#interrupt-cells = <2>;



		nr-gpios = <64>;

	};

Documentation/devicetree/bindings/gpio/led.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ node's name represents the name of the corresponding LED. 


LED sub-node properties:

- gpios :  Should specify the LED's GPIO, see "gpios property" in

  Documentation/devicetree/gpio.txt.  Active low LEDs should be

  Documentation/devicetree/bindings/gpio/gpio.txt.  Active low LEDs should be

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

arch/arm/configs/kzm9g_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_KEYBOARD_GPIO_POLLED=y

CONFIG_ARCH_SH73A0=y

CONFIG_MACH_KZM9G=y

CONFIG_MEMORY_START=0x41000000
@@ -71,6 +70,7 @@ CONFIG_INPUT_SPARSEKMAP=y 
# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

arch/arm/mach-shmobile/board-kzm9g.c

+2 −3
Original line number Diff line number Diff line
@@ -482,12 +482,10 @@ static struct gpio_keys_button gpio_buttons[] = { 
static struct gpio_keys_platform_data gpio_key_info = {

	.buttons	= gpio_buttons,

	.nbuttons	= ARRAY_SIZE(gpio_buttons),

	.poll_interval	= 250, /* poling at this point */

};



static struct platform_device gpio_keys_device = {

	/* gpio-pcf857x.c driver doesn't support gpio_to_irq() */

	.name	= "gpio-keys-polled",

	.name	= "gpio-keys",

	.dev	= {

		.platform_data  = &gpio_key_info,

	},
@@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = { 
/* I2C */

static struct pcf857x_platform_data pcf8575_pdata = {

	.gpio_base	= GPIO_PCF8575_BASE,

	.irq		= intcs_evt2irq(0x3260), /* IRQ19 */

};



static struct i2c_board_info i2c0_devices[] = {