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

Commit 43872fa7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/rmk/gpio' into next/fixes 



This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 91fed558 f55be1bf

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -835,6 +835,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>