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

Commit dffd7e35 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 944483d0 53430333

arch/arm/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -240,13 +240,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

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/plat-samsung/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -51,22 +51,6 @@ config SAMSUNG_ATAGS 


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

	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.



config SAMSUNG_GPIO_EXTRA64

	bool



config SAMSUNG_GPIO_EXTRA128

	bool



config S3C_GPIO_SPACE

	int "Space between gpio banks"

	default 0

arch/arm/plat-samsung/include/plat/gpio-core.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
#ifndef __PLAT_SAMSUNG_GPIO_CORE_H

#define __PLAT_SAMSUNG_GPIO_CORE_H



/* Bring in machine-local definitions, especially S3C_GPIO_END */

#include <mach/gpio-samsung.h>



#define GPIOCON_OFF	(0x00)

#define GPIODAT_OFF	(0x04)

arch/arm/plat-samsung/pm-gpio.c

+0 −2
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ 
#include <linux/io.h>

#include <linux/gpio.h>



#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)

#include <mach/gpio-samsung.h>

#endif



#include <plat/gpio-core.h>

#include <plat/pm.h>