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

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

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

Pull GPIO changes from Linus Walleij:
 - New driver for AMD-8111 southbridge GPIOs
 - New driver for Wolfson Micro Arizona devices
 - Propagate device tree parse errors
 - Probe deferral finalizations - all expected calls to GPIO will now
   hopefully request deferral where apropriate
 - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP
   and PCA953X drivers.

Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c

* tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available
  gpiolib: Defer failed gpio requests by default
  MAINTAINERS: add entry OMAP GPIO driver
  gpio/pca953x: increase variables size to support 24 bit of data
  GPIO: PCA953X: Increase size of invert variable to support 24 bit
  gpio/omap: move bank->dbck initialization to omap_gpio_mod_init()
  gpio/mxc: use the edge_sel feature if available
  gpio: propagate of_parse_phandle_with_args errors
  gpio: samsung: add flags specifier to device-tree binding
  gpiolib: Add support for Wolfson Microelectronics Arizona class devices
  gpio: gpio-lpc32xx: Add gpio_to_irq mapping
  gpio: pcf857x: share 8/16 bit access functions
  gpio: LPC32xx: Driver cleanup
  MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry
  gpiolib: wm8994: Convert to devm_kzalloc()
  gpiolib: wm8994: Use irq_domain mappings for gpios
  gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips
  gpio/tca6424: merge I2C transactions, remove cast
  gpio/of: fix a typo of comment message
parents 608adca5 4fbb0022

Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Required properties: 
Example:



gpio0: gpio@73f84000 {

	compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

	compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";

	reg = <0x73f84000 0x4000>;

	interrupts = <50 51>;

	gpio-controller;

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

+5 −4
Original line number Diff line number Diff line
@@ -11,14 +11,15 @@ Required properties: 
     <[phandle of the gpio controller node]

      [pin number within the gpio controller]

      [mux function]

      [pull up/down]

      [flags and pull up/down]

      [drive strength]>



  Values for gpio specifier:

  - Pin number: is a value between 0 to 7.

  - Pull Up/Down: 0 - Pull Up/Down Disabled.

  - Flags and Pull Up/Down: 0 - Pull Up/Down Disabled.

                            1 - Pull Down Enabled.

                            3 - Pull Up Enabled.

          Bit 16 (0x00010000) - Input is active low.

  - Drive Strength: 0 - 1x,

                    1 - 3x,

                    2 - 2x,

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -4961,6 +4961,13 @@ S: Maintained 
F:	drivers/usb/*/*omap*

F:	arch/arm/*omap*/usb*



OMAP GPIO DRIVER

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/gpio/gpio-omap.c



OMFS FILESYSTEM

M:	Bob Copeland <me@bobcopeland.com>

L:	linux-karma-devel@lists.sourceforge.net
@@ -7615,6 +7622,7 @@ F: Documentation/hwmon/wm83?? 
F:	arch/arm/mach-s3c64xx/mach-crag6410*

F:	drivers/clk/clk-wm83*.c

F:	drivers/leds/leds-wm83*.c

F:	drivers/gpio/gpio-*wm*.c

F:	drivers/hwmon/wm83??-hwmon.c

F:	drivers/input/misc/wm831x-on.c

F:	drivers/input/touchscreen/wm831x-ts.c

arch/arm/boot/dts/imx51.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
			};



			gpio1: gpio@73f84000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";

				reg = <0x73f84000 0x4000>;

				interrupts = <50 51>;

				gpio-controller;
@@ -137,7 +137,7 @@ 
			};



			gpio2: gpio@73f88000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";

				reg = <0x73f88000 0x4000>;

				interrupts = <52 53>;

				gpio-controller;
@@ -147,7 +147,7 @@ 
			};



			gpio3: gpio@73f8c000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";

				reg = <0x73f8c000 0x4000>;

				interrupts = <54 55>;

				gpio-controller;
@@ -157,7 +157,7 @@ 
			};



			gpio4: gpio@73f90000 {

				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";

				reg = <0x73f90000 0x4000>;

				interrupts = <56 57>;

				gpio-controller;

arch/arm/boot/dts/imx53.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
			};



			gpio1: gpio@53f84000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53f84000 0x4000>;

				interrupts = <50 51>;

				gpio-controller;
@@ -139,7 +139,7 @@ 
			};



			gpio2: gpio@53f88000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53f88000 0x4000>;

				interrupts = <52 53>;

				gpio-controller;
@@ -149,7 +149,7 @@ 
			};



			gpio3: gpio@53f8c000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53f8c000 0x4000>;

				interrupts = <54 55>;

				gpio-controller;
@@ -159,7 +159,7 @@ 
			};



			gpio4: gpio@53f90000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53f90000 0x4000>;

				interrupts = <56 57>;

				gpio-controller;
@@ -197,7 +197,7 @@ 
			};



			gpio5: gpio@53fdc000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53fdc000 0x4000>;

				interrupts = <103 104>;

				gpio-controller;
@@ -207,7 +207,7 @@ 
			};



			gpio6: gpio@53fe0000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53fe0000 0x4000>;

				interrupts = <105 106>;

				gpio-controller;
@@ -217,7 +217,7 @@ 
			};



			gpio7: gpio@53fe4000 {

				compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";

				compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";

				reg = <0x53fe4000 0x4000>;

				interrupts = <107 108>;

				gpio-controller;