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

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 

* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
parents 60325f0c 374e759d

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -836,6 +836,7 @@ config ARCH_U300 
	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
 */



#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <asm/gpio.h>

#include <asm/hardware/scoop.h>



/* PCMCIA to Scoop linkage

arch/arm/include/asm/gpio.h

+19 −0
Original line number Diff line number Diff line
@@ -4,4 +4,23 @@ 
/* not all ARM platforms necessarily support this API ... */

#include <mach/gpio.h>



#ifndef __ARM_GPIOLIB_COMPLEX

/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */

#include <asm-generic/gpio.h>



/* The trivial gpiolib dispatchers */

#define gpio_get_value  __gpio_get_value

#define gpio_set_value  __gpio_set_value

#define gpio_cansleep   __gpio_cansleep

#endif



/*

 * Provide a default gpio_to_irq() which should satisfy every case.

 * However, some platforms want to do this differently, so allow them

 * to override it.

 */

#ifndef gpio_to_irq

#define gpio_to_irq	__gpio_to_irq

#endif



#endif /* _ARCH_ARM_GPIO_H */

arch/arm/include/asm/hardware/iop3xx-gpio.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <mach/hardware.h>

#include <asm-generic/gpio.h>



#define __ARM_GPIOLIB_COMPLEX



#define IOP3XX_N_GPIOS	8



static inline int gpio_get_value(unsigned gpio)

arch/arm/mach-at91/at91cap9_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/mach/irq.h>



#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/i2c-gpio.h>
@@ -23,7 +24,6 @@ 


#include <mach/board.h>

#include <mach/cpu.h>

#include <mach/gpio.h>

#include <mach/at91cap9.h>

#include <mach/at91cap9_matrix.h>

#include <mach/at91sam9_smc.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE