From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Jul 2012 20:56:38 +0000 (-0700)
Subject: Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f948ad0787de7b393c325803014fd7d5f1b501b1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'gpio-for-v3.6' of git://git./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
---

f948ad0787de7b393c325803014fd7d5f1b501b1
diff --cc MAINTAINERS
index 429e72cc13fc,eeb9b731a474..5b41de49a324
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7613,8 -7584,8 +7620,9 @@@ W:	http://opensource.wolfsonmicro.com/c
  S:	Supported
  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
diff --cc drivers/gpio/gpio-mxc.c
index 04691d3abe60,bb985e815533..4db460b6ecf7
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -160,15 -184,19 +184,19 @@@ static int gpio_set_irq_type(struct irq
  		edge = GPIO_INT_FALL_EDGE;
  		break;
  	case IRQ_TYPE_EDGE_BOTH:
- 		val = gpio_get_value(gpio);
- 		if (val) {
- 			edge = GPIO_INT_LOW_LEV;
- 			pr_debug("mxc: set GPIO %d to low trigger\n", gpio);
+ 		if (GPIO_EDGE_SEL >= 0) {
+ 			edge = GPIO_INT_BOTH_EDGES;
  		} else {
- 			edge = GPIO_INT_HIGH_LEV;
- 			pr_debug("mxc: set GPIO %d to high trigger\n", gpio);
+ 			val = gpio_get_value(gpio);
+ 			if (val) {
+ 				edge = GPIO_INT_LOW_LEV;
+ 				pr_debug("mxc: set GPIO %d to low trigger\n", gpio);
+ 			} else {
+ 				edge = GPIO_INT_HIGH_LEV;
+ 				pr_debug("mxc: set GPIO %d to high trigger\n", gpio);
+ 			}
 -			port->both_edges |= 1 << (gpio & 31);
++			port->both_edges |= 1 << gpio_idx;
  		}
- 		port->both_edges |= 1 << gpio_idx;
  		break;
  	case IRQ_TYPE_LEVEL_LOW:
  		edge = GPIO_INT_LOW_LEV;
@@@ -180,11 -208,24 +208,24 @@@
  		return -EINVAL;
  	}
  
- 	reg += GPIO_ICR1 + ((gpio_idx & 0x10) >> 2); /* ICR1 or ICR2 */
- 	bit = gpio_idx & 0xf;
- 	val = readl(reg) & ~(0x3 << (bit << 1));
- 	writel(val | (edge << (bit << 1)), reg);
+ 	if (GPIO_EDGE_SEL >= 0) {
+ 		val = readl(port->base + GPIO_EDGE_SEL);
+ 		if (edge == GPIO_INT_BOTH_EDGES)
 -			writel(val | (1 << (gpio & 0x1f)),
++			writel(val | (1 << gpio_idx),
+ 				port->base + GPIO_EDGE_SEL);
+ 		else
 -			writel(val & ~(1 << (gpio & 0x1f)),
++			writel(val & ~(1 << gpio_idx),
+ 				port->base + GPIO_EDGE_SEL);
+ 	}
+ 
+ 	if (edge != GPIO_INT_BOTH_EDGES) {
 -		reg += GPIO_ICR1 + ((gpio & 0x10) >> 2); /* lower or upper register */
 -		bit = gpio & 0xf;
++		reg += GPIO_ICR1 + ((gpio_idx & 0x10) >> 2); /* lower or upper register */
++		bit = gpio_idx & 0xf;
+ 		val = readl(reg) & ~(0x3 << (bit << 1));
+ 		writel(val | (edge << (bit << 1)), reg);
+ 	}
+ 
 -	writel(1 << (gpio & 0x1f), port->base + GPIO_ISR);
 +	writel(1 << gpio_idx, port->base + GPIO_ISR);
  
  	return 0;
  }