From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 26 Jul 2014 16:00:40 +0000 (+0200)
Subject: Merge branch 'cleanup/gpio-header-removal' into next/soc
X-Git-Tag: v3.17-rc1~79^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dffd7e35a50d1f8fd79805dd10d412a041f67cb3;p=karo-tx-linux.git

Merge branch 'cleanup/gpio-header-removal' into next/soc

* cleanup/gpio-header-removal:
  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

This resolves a massive amount of conflicts between the
mach/gpio.h removal and the s5p platform removal.

Almost all changes are trivial, as both sides remove
stuff.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-s5p64x0/common.c
	arch/arm/mach-s5p64x0/dev-audio.c
	arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
	arch/arm/mach-s5p64x0/mach-smdk6440.c
	arch/arm/mach-s5p64x0/mach-smdk6450.c
	arch/arm/mach-s5p64x0/setup-fb-24bpp.c
	arch/arm/mach-s5p64x0/setup-i2c0.c
	arch/arm/mach-s5p64x0/setup-i2c1.c
	arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
	arch/arm/mach-s5p64x0/setup-spi.c
	arch/arm/mach-s5pc100/dev-audio.c
	arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
	arch/arm/mach-s5pc100/mach-smdkc100.c
	arch/arm/mach-s5pc100/setup-fb-24bpp.c
	arch/arm/mach-s5pc100/setup-i2c0.c
	arch/arm/mach-s5pc100/setup-i2c1.c
	arch/arm/mach-s5pc100/setup-ide.c
	arch/arm/mach-s5pc100/setup-keypad.c
	arch/arm/mach-s5pc100/setup-sdhci-gpio.c
	arch/arm/mach-s5pc100/setup-spi.c
	arch/arm/mach-s5pv210/dev-audio.c
	arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c
	arch/arm/mach-s5pv210/mach-smdkv210.c
	arch/arm/mach-s5pv210/setup-fb-24bpp.c
	arch/arm/mach-s5pv210/setup-fimc.c
	arch/arm/mach-s5pv210/setup-i2c0.c
	arch/arm/mach-s5pv210/setup-i2c1.c
	arch/arm/mach-s5pv210/setup-i2c2.c
	arch/arm/mach-s5pv210/setup-ide.c
	arch/arm/mach-s5pv210/setup-keypad.c
	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
	arch/arm/mach-s5pv210/setup-spi.c
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/s5p-irq-eint.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

dffd7e35a50d1f8fd79805dd10d412a041f67cb3
diff --cc arch/arm/plat-samsung/Kconfig
index 1091b0a3729a,1e1811274e74..c87aefbf3a13
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -51,22 -65,49 +51,6 @@@ config SAMSUNG_ATAG
  
  if SAMSUNG_ATAGS
  
- config SAMSUNG_GPIO_EXTRA
- 	int "Number of additional GPIO pins"
- 	default 128 if SAMSUNG_GPIO_EXTRA128
- 	default 64 if SAMSUNG_GPIO_EXTRA64
- 	default 0
 -# clock options
 -
 -config SAMSUNG_CLOCK
 -	bool
 -	default y if !COMMON_CLK
 -
 -config SAMSUNG_CLKSRC
 -	bool
--	help
- 	  Use additional GPIO space in addition to the GPIO's the SOC
- 	  provides. This allows expanding the GPIO space for use with
- 	  GPIO expanders.
 -	  Select the clock code for the clksrc implementation
 -	  used by newer systems such as the S3C64XX.
--
- config SAMSUNG_GPIO_EXTRA64
 -config S5P_CLOCK
 -	def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
 -	help
 -	  Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
 -
 -# options for IRQ support
 -
 -config S5P_IRQ
 -	def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
 -	help
 -	  Support common interrupt part for ARCH_S5P SoCs
 -
 -config S5P_EXT_INT
--	bool
 -	help
 -	  Use the external interrupts (other than GPIO interrupts.)
 -	  Note: Do not choose this for S5P6440 and S5P6450.
--
- config SAMSUNG_GPIO_EXTRA128
 -config S5P_GPIO_INT
 -	bool
 -	help
 -	  Common code for the GPIO interrupts (other than external interrupts.)
 -
 -# options for gpio configuration support
 -
 -config S5P_GPIO_DRVSTR
--	bool
 -	help
 -	  Internal configuration to get and set correct GPIO driver strength
 -	  helper
--
  config S3C_GPIO_SPACE
  	int "Space between gpio banks"
  	default 0