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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTsbzlAAoJEEEQszewGV1zn6sP/A2gZCr2PGRjHyOSC7iUqBDi XEV8XchFPFDNaQH3Vlw9m5T/8HE6XoQ2qGF2N+l5HhZsmOHeoCvfko1MX9h/TjNM Eh6inWTVFyQ2xKPjsuj4mWVivxIZhRCsZ9WSZPnK2YqaWjd6JSkbcfiDiKKt/Tnp pcef7pIOWBIpNOKTTiCB8EBLc1umzmboyB6WuM1v4Mp5lpNmJMEeLBO9rcV+XaD2 N9iZVbaRxGGFWZ6FyVCzUeF+0pIDjhyYjnLf5SMmv/mQ57VC2OuBdoZkyJWkBbVy re9CpFbUQMHbqQGiYjdInhcTne1oxS+OlTBseQ6agnDmZRLU1Ozr+NwBEHrpfPPv 4uQ59AUCT6k3r8IJcGes4b+Rnjh96HTiJkE4UopYeTShcLpW5iaEI18sXpxoY8Fv ticSq34KDMBxZz22QWwumUuBHWZq47fxo0ufbqgTn5bqZ//PnDL7zy2frObmszuU Oubqs6ebLAsfa50eiQsz0gQ4cbjBDpQ0900C+09yZ6QzX4VsFfX5j7T49xJ2n3R+ l6D7Xa7nJ4bnHyzjrGevmsflEz4FId6zpCOQfLJboc4agDzkOWKA1bPTsXa2DD0O qFBYgXBniZ+KeNwHfwFU94Qa3ukyE+GkDIyKRPY7vaAgHp8Dulm7tvcmyKWvcgY4 pNdV7YOCcMgSQXcbA4+y =Gyiy -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
cb6a0fd4e4
|
@ -239,13 +239,6 @@ config ARM_PATCH_PHYS_VIRT
|
||||||
this feature (eg, building a kernel for a single machine) and
|
this feature (eg, building a kernel for a single machine) and
|
||||||
you need to shrink the kernel to the minimal size.
|
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
|
config NEED_MACH_IO_H
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
|
@ -770,7 +763,6 @@ config ARCH_S5PV210
|
||||||
select HAVE_S3C2410_I2C if I2C
|
select HAVE_S3C2410_I2C if I2C
|
||||||
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
select HAVE_S3C2410_WATCHDOG if WATCHDOG
|
||||||
select HAVE_S3C_RTC if RTC_CLASS
|
select HAVE_S3C_RTC if RTC_CLASS
|
||||||
select NEED_MACH_GPIO_H
|
|
||||||
select NEED_MACH_MEMORY_H
|
select NEED_MACH_MEMORY_H
|
||||||
select SAMSUNG_ATAGS
|
select SAMSUNG_ATAGS
|
||||||
help
|
help
|
||||||
|
|
|
@ -5,12 +5,6 @@
|
||||||
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
|
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
|
||||||
#endif
|
#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 */
|
/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */
|
||||||
#include <asm-generic/gpio.h>
|
#include <asm-generic/gpio.h>
|
||||||
|
|
||||||
|
@ -18,7 +12,6 @@
|
||||||
#define gpio_get_value __gpio_get_value
|
#define gpio_get_value __gpio_get_value
|
||||||
#define gpio_set_value __gpio_set_value
|
#define gpio_set_value __gpio_set_value
|
||||||
#define gpio_cansleep __gpio_cansleep
|
#define gpio_cansleep __gpio_cansleep
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Provide a default gpio_to_irq() which should satisfy every case.
|
* Provide a default gpio_to_irq() which should satisfy every case.
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
|
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <linux/platform_data/asoc-s3c.h>
|
#include <linux/platform_data/asoc-s3c.h>
|
||||||
|
@ -18,6 +17,7 @@
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <mach/dma.h>
|
#include <mach/dma.h>
|
||||||
#include <mach/irqs.h>
|
#include <mach/irqs.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#define S5PV210_AUDSS_INT_MEM (0xC0000000)
|
#define S5PV210_AUDSS_INT_MEM (0xC0000000)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
/* linux/arch/arm/mach-s5pv210/include/mach/gpio.h
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
|
||||||
* http://www.samsung.com/
|
* http://www.samsung.com/
|
||||||
*
|
*
|
||||||
|
@ -133,8 +132,4 @@ enum s5p_gpio_number {
|
||||||
#define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)
|
#define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)
|
||||||
#define S3C_GPIO_END S5PV210_GPIO_END
|
#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 */
|
#endif /* __ASM_ARCH_GPIO_H */
|
|
@ -31,6 +31,7 @@
|
||||||
#include <video/samsung_fimd.h>
|
#include <video/samsung_fimd.h>
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <mach/regs-clock.h>
|
#include <mach/regs-clock.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include <video/samsung_fimd.h>
|
#include <video/samsung_fimd.h>
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <mach/regs-clock.h>
|
#include <mach/regs-clock.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <mach/regs-clock.h>
|
#include <mach/regs-clock.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#include <plat/regs-srom.h>
|
#include <plat/regs-srom.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
|
|
@ -13,12 +13,12 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <plat/fb.h>
|
#include <plat/fb.h>
|
||||||
#include <mach/regs-clock.h>
|
#include <mach/regs-clock.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
|
static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,9 +8,10 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/gpio.h>
|
#include <linux/kernel.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <plat/camport.h>
|
#include <plat/camport.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
|
int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
struct platform_device; /* don't need the contents */
|
struct platform_device; /* don't need the contents */
|
||||||
|
|
||||||
#include <linux/platform_data/i2c-s3c2410.h>
|
#include <linux/platform_data/i2c-s3c2410.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
|
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
struct platform_device; /* don't need the contents */
|
struct platform_device; /* don't need the contents */
|
||||||
|
|
||||||
#include <linux/platform_data/i2c-s3c2410.h>
|
#include <linux/platform_data/i2c-s3c2410.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
void s3c_i2c1_cfg_gpio(struct platform_device *dev)
|
void s3c_i2c1_cfg_gpio(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
struct platform_device; /* don't need the contents */
|
struct platform_device; /* don't need the contents */
|
||||||
|
|
||||||
#include <linux/platform_data/i2c-s3c2410.h>
|
#include <linux/platform_data/i2c-s3c2410.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
void s3c_i2c2_cfg_gpio(struct platform_device *dev)
|
void s3c_i2c2_cfg_gpio(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
|
static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/gpio.h>
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
|
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
#include <linux/mmc/host.h>
|
#include <linux/mmc/host.h>
|
||||||
#include <linux/mmc/card.h>
|
#include <linux/mmc/card.h>
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <plat/sdhci.h>
|
#include <plat/sdhci.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
|
void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/gpio.h>
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#ifdef CONFIG_S3C64XX_DEV_SPI0
|
#ifdef CONFIG_S3C64XX_DEV_SPI0
|
||||||
int s3c64xx_spi0_cfg_gpio(void)
|
int s3c64xx_spi0_cfg_gpio(void)
|
||||||
|
|
|
@ -107,22 +107,6 @@ config S5P_GPIO_DRVSTR
|
||||||
Internal configuration to get and set correct GPIO driver strength
|
Internal configuration to get and set correct GPIO driver strength
|
||||||
helper
|
helper
|
||||||
|
|
||||||
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
|
config S3C_GPIO_SPACE
|
||||||
int "Space between gpio banks"
|
int "Space between gpio banks"
|
||||||
default 0
|
default 0
|
||||||
|
|
|
@ -14,6 +14,9 @@
|
||||||
#ifndef __PLAT_SAMSUNG_GPIO_CORE_H
|
#ifndef __PLAT_SAMSUNG_GPIO_CORE_H
|
||||||
#define __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 GPIOCON_OFF (0x00)
|
||||||
#define GPIODAT_OFF (0x04)
|
#define GPIODAT_OFF (0x04)
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
|
|
||||||
#include <mach/gpio-samsung.h>
|
#include <mach/gpio-samsung.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <plat/gpio-core.h>
|
#include <plat/gpio-core.h>
|
||||||
#include <plat/pm.h>
|
#include <plat/pm.h>
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/gpio.h>
|
|
||||||
#include <linux/irqchip/arm-vic.h>
|
#include <linux/irqchip/arm-vic.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
|
||||||
|
@ -26,6 +25,7 @@
|
||||||
|
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <mach/regs-gpio.h>
|
#include <mach/regs-gpio.h>
|
||||||
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
static inline void s5p_irq_eint_mask(struct irq_data *data)
|
static inline void s5p_irq_eint_mask(struct irq_data *data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,10 +32,7 @@
|
||||||
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#include <mach/regs-gpio.h>
|
#include <mach/regs-gpio.h>
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
|
|
||||||
#include <mach/gpio-samsung.h>
|
#include <mach/gpio-samsung.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <plat/cpu.h>
|
#include <plat/cpu.h>
|
||||||
#include <plat/gpio-core.h>
|
#include <plat/gpio-core.h>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include <sound/jack.h>
|
#include <sound/jack.h>
|
||||||
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <mach/gpio.h>
|
#include <mach/gpio-samsung.h>
|
||||||
|
|
||||||
#include "../codecs/wm8994.h"
|
#include "../codecs/wm8994.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue