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

Commit 41684f67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
  h8300: Move gpio.h to gpio-internal.h
  gpio: pl061: add DT binding support
  gpio: fix build error in include/asm-generic/gpio.h
  gpiolib: Ensure struct gpio is always defined
  irq: Add EXPORT_SYMBOL_GPL to function of irq generic-chip
  gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL
  gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL
  gpio: langwell: ensure alternate function is cleared
  gpio-pch: Support interrupt function
  gpio-pch: Save register value in suspend()
  gpio-pch: modify gpio_nums and mask
  gpio-pch: support ML7223 IOH n-Bus
  gpio-pch: add spinlock in suspend/resume processing
  gpio-pch: Delete invalid "restore" code in suspend()
  gpio-ml-ioh: Fix suspend/resume issue
  gpio-ml-ioh: Support interrupt function
  gpio-ml-ioh: Delete unnecessary code
  gpio/mxc: add chained_irq_enter/exit() to mx3_gpio_irq_handler()
  gpio/nomadik: use genirq core to track enablement
  gpio/nomadik: disable clocks when unused
parents ec7ae517 d92ef29a

arch/arm/plat-nomadik/include/plat/gpio-nomadik.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ extern int nmk_gpio_get_mode(int gpio); 
extern void nmk_gpio_wakeups_suspend(void);

extern void nmk_gpio_wakeups_resume(void);



extern void nmk_gpio_clocks_enable(void);

extern void nmk_gpio_clocks_disable(void);



extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);



/*

arch/h8300/platform/h8300h/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <asm/traps.h>

#include <asm/irq.h>

#include <asm/io.h>

#include <asm/gpio.h>

#include <asm/gpio-internal.h>

#include <asm/regs306x.h>



const int __initdata h8300_saved_vectors[] = {

arch/h8300/platform/h8s/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm/traps.h>

#include <asm/irq.h>

#include <asm/io.h>

#include <asm/gpio.h>

#include <asm/gpio-internal.h>

#include <asm/regs267x.h>



/* saved vector list */

drivers/gpio/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ config GPIO_LANGWELL 
config GPIO_PCH

	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO"

	depends on PCI && X86

	select GENERIC_IRQ_CHIP

	help

	  This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff

	  which is an IOH(Input/Output Hub) for x86 embedded processor.
@@ -411,6 +412,7 @@ config GPIO_PCH 
config GPIO_ML_IOH

	tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"

	depends on PCI

	select GENERIC_IRQ_CHIP

	help

	  ML7213 is companion chip for Intel Atom E6xx series.

	  This driver can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/Output