Commit cb6a0fd4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gpio-h-purge' of... 

Merge tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into next/cleanup

This is a purge of all things <mach/gpio.h>, now I never
want to see it again.

- Remove the need for <mach/gpio.h> from S5P
- Kill CONFIG_NEED_MACH_GPIO_H
- Kill remnants of ARM_GPIOLIB_COMPLEX

* tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

:
  ARM: delete old reference to ARM_GPIOLIB_COMPLEX
  ARM: kill CONFIG_NEED_MACH_GPIO_H
  ARM: mach-s5p: get rid of all <mach/gpio.h> headers
  ARM: s5p: cut the custom ARCH_NR_GPIOS definition

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1adcba9 53430333

arch/arm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -239,13 +239,6 @@ config ARM_PATCH_PHYS_VIRT 
	  this feature (eg, building a kernel for a single machine) and

	  you need to shrink the kernel to the minimal size.



config NEED_MACH_GPIO_H

	bool

	help

	  Select this when mach/gpio.h is required to provide special

	  definitions for this platform. The need for mach/gpio.h should

	  be avoided when possible.



config NEED_MACH_IO_H

	bool

	help
@@ -770,7 +763,6 @@ config ARCH_S5PV210 
	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select NEED_MACH_MEMORY_H

	select SAMSUNG_ATAGS

	help

arch/arm/include/asm/gpio.h

+0 −7
Original line number Diff line number Diff line
@@ -5,12 +5,6 @@ 
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO

#endif



/* not all ARM platforms necessarily support this API ... */

#ifdef CONFIG_NEED_MACH_GPIO_H

#include <mach/gpio.h>

#endif



#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>
@@ -18,7 +12,6 @@ 
#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.

arch/arm/mach-s5pv210/dev-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>



#include <plat/gpio-cfg.h>

#include <linux/platform_data/asoc-s3c.h>
@@ -18,6 +17,7 @@ 
#include <mach/map.h>

#include <mach/dma.h>

#include <mach/irqs.h>

#include <mach/gpio-samsung.h>



#define S5PV210_AUDSS_INT_MEM	(0xC0000000)

arch/arm/mach-s5pv210/include/mach/gpio.h→arch/arm/mach-s5pv210/include/mach/gpio-samsung.h

+1 −6
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv210/include/mach/gpio.h

 *

/*

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *
@@ -133,8 +132,4 @@ enum s5p_gpio_number { 
#define S5PV210_GPIO_END	(S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)

#define S3C_GPIO_END		S5PV210_GPIO_END



/* define the number of gpios we need to the one after the MP05() range */

#define ARCH_NR_GPIOS		(S5PV210_MP05(S5PV210_GPIO_MP05_NR) +	\

				 CONFIG_SAMSUNG_GPIO_EXTRA + 1)



#endif /* __ASM_ARCH_GPIO_H */

arch/arm/mach-s5pv210/mach-aquila.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <video/samsung_fimd.h>

#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/gpio-samsung.h>



#include <plat/gpio-cfg.h>

#include <plat/devs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE