mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

ARM: mach-s5p: get rid of all <mach/gpio.h> headers

Browse source 
This renames all the local <mach/gpio.h> headers in the S5P platforms
to <mach/gpio-samsung.h> indicating a scope local to this platform,
and cuts the implicit inclusion of <mach/gpio.h> from <linux/gpio.h>
by removing the use of NEED_MACH_GPIO_H from all S5P variants.

Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-06-04 15:10:45 +02:00
parent ab275b132a
commit 2fd48f9442
40 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/Kconfig
View file

@ -769,7 +769,6 @@ config ARCH_S5P64X0
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 SAMSUNG_ATAGS
select SAMSUNG_WDT_RESET
help
@ -788,7 +787,6 @@ config ARCH_S5PC100
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 SAMSUNG_ATAGS
select SAMSUNG_WDT_RESET
help
@ -807,7 +805,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

2
arch/arm/mach-s5p64x0/common.c
View file

@ -24,7 +24,6 @@
#include <linux/platform_device.h>
#include <linux/sched.h>
#include <linux/dma-mapping.h>
#include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/reboot.h>
@ -39,6 +38,7 @@
#include <mach/hardware.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
#include <plat/cpu.h>
#include <plat/clock.h>

3
arch/arm/mach-s5p64x0/dev-audio.c
View file

@ -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,8 @@
#include <mach/map.h>
#include <mach/dma.h>
#include <mach/irqs.h>
#include <mach/gpio-samsung.h>
static int s5p6440_cfg_i2s(struct platform_device *pdev)
{

3
arch/arm/mach-s5p64x0/include/mach/gpio.h → arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
View file

@ -1,5 +1,4 @@
/* linux/arch/arm/mach-s5p64x0/include/mach/gpio.h
*
/*
* Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*

1
arch/arm/mach-s5p64x0/mach-smdk6440.c
View file

@ -39,6 +39,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>

1
arch/arm/mach-s5p64x0/mach-smdk6450.c
View file

@ -39,6 +39,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>

2
arch/arm/mach-s5p64x0/setup-fb-24bpp.c
View file

@ -11,11 +11,11 @@
*/
#include <linux/fb.h>
#include <linux/gpio.h>
#include <plat/cpu.h>
#include <plat/fb.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s5p64x0_fb_gpio_setup_24bpp(void)
{

2
arch/arm/mach-s5p64x0/setup-i2c0.c
View file

@ -14,11 +14,11 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include "i2c.h"

2
arch/arm/mach-s5p64x0/setup-i2c1.c
View file

@ -14,11 +14,11 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include "i2c.h"

2
arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
View file

@ -12,10 +12,10 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include <plat/sdhci.h>

2
arch/arm/mach-s5p64x0/setup-spi.c
View file

@ -8,8 +8,8 @@
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
#ifdef CONFIG_S3C64XX_DEV_SPI0
int s3c64xx_spi0_cfg_gpio(void)

2
arch/arm/mach-s5pc100/dev-audio.c
View file

@ -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>
static int s5pc100_cfg_i2s(struct platform_device *pdev)
{

3
arch/arm/mach-s5pc100/include/mach/gpio.h → arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
View file

@ -1,5 +1,4 @@
/* arch/arm/mach-s5pc100/include/mach/gpio.h
*
/*
* Copyright 2009 Samsung Electronics Co.
* Byungho Min <bhmin@samsung.com>
*

1
arch/arm/mach-s5pc100/mach-smdkc100.c
View file

@ -31,6 +31,7 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
#include <video/platform_lcd.h>
#include <video/samsung_fimd.h>

2
arch/arm/mach-s5pc100/setup-fb-24bpp.c
View file

@ -13,9 +13,9 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/fb.h>
#include <linux/gpio.h>
#include <mach/map.h>
#include <mach/gpio-samsung.h>
#include <plat/fb.h>
#include <plat/gpio-cfg.h>

2
arch/arm/mach-s5pc100/setup-i2c0.c
View file

@ -17,9 +17,9 @@
struct platform_device; /* don't need the contents */
#include <linux/gpio.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
{

2
arch/arm/mach-s5pc100/setup-i2c1.c
View file

@ -17,9 +17,9 @@
struct platform_device; /* don't need the contents */
#include <linux/gpio.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s3c_i2c1_cfg_gpio(struct platform_device *dev)
{

2
arch/arm/mach-s5pc100/setup-ide.c
View file

@ -11,11 +11,11 @@
*/
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
#include <mach/regs-clock.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
static void s5pc100_ide_cfg_gpios(unsigned int base, unsigned int nr)
{

2
arch/arm/mach-s5pc100/setup-keypad.c
View file

@ -10,8 +10,8 @@
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
{

2
arch/arm/mach-s5pc100/setup-sdhci-gpio.c
View file

@ -14,12 +14,12 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/mmc/host.h>
#include <linux/mmc/card.h>
#include <plat/gpio-cfg.h>
#include <plat/sdhci.h>
#include <mach/gpio-samsung.h>
void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
{

2
arch/arm/mach-s5pc100/setup-spi.c
View file

@ -8,8 +8,8 @@
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
#ifdef CONFIG_S3C64XX_DEV_SPI0
int s3c64xx_spi0_cfg_gpio(void)

2
arch/arm/mach-s5pv210/dev-audio.c
View file

@ -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)

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

@ -1,5 +1,4 @@
/* linux/arch/arm/mach-s5pv210/include/mach/gpio.h
*
/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*

1
arch/arm/mach-s5pv210/mach-aquila.c
View file

@ -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>

1
arch/arm/mach-s5pv210/mach-goni.c
View file

@ -38,6 +38,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>

1
arch/arm/mach-s5pv210/mach-smdkv210.c
View file

@ -32,6 +32,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/gpio-samsung.h>
#include <plat/regs-srom.h>
#include <plat/gpio-cfg.h>

2
arch/arm/mach-s5pv210/setup-fb-24bpp.c
View file

@ -13,12 +13,12 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/fb.h>
#include <linux/gpio.h>
#include <mach/map.h>
#include <plat/fb.h>
#include <mach/regs-clock.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
{

3
arch/arm/mach-s5pv210/setup-fimc.c
View file

@ -8,9 +8,10 @@
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <plat/gpio-cfg.h>
#include <plat/camport.h>
#include <mach/gpio-samsung.h>
int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
{

2
arch/arm/mach-s5pv210/setup-i2c0.c
View file

@ -14,12 +14,12 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s3c_i2c0_cfg_gpio(struct platform_device *dev)
{

2
arch/arm/mach-s5pv210/setup-i2c1.c
View file

@ -14,12 +14,12 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s3c_i2c1_cfg_gpio(struct platform_device *dev)
{

2
arch/arm/mach-s5pv210/setup-i2c2.c
View file

@ -14,12 +14,12 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
#include <linux/platform_data/i2c-s3c2410.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void s3c_i2c2_cfg_gpio(struct platform_device *dev)
{

2
arch/arm/mach-s5pv210/setup-ide.c
View file

@ -11,9 +11,9 @@
*/
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
{

2
arch/arm/mach-s5pv210/setup-keypad.c
View file

@ -11,8 +11,8 @@
*
*/
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
{

2
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
View file

@ -15,12 +15,12 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/mmc/host.h>
#include <linux/mmc/card.h>
#include <plat/gpio-cfg.h>
#include <plat/sdhci.h>
#include <mach/gpio-samsung.h>
void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
{

2
arch/arm/mach-s5pv210/setup-spi.c
View file

@ -8,8 +8,8 @@
* published by the Free Software Foundation.
*/
#include <linux/gpio.h>
#include <plat/gpio-cfg.h>
#include <mach/gpio-samsung.h>
#ifdef CONFIG_S3C64XX_DEV_SPI0
int s3c64xx_spi0_cfg_gpio(void)

3
arch/arm/plat-samsung/include/plat/gpio-core.h
View file

@ -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)

2
arch/arm/plat-samsung/pm-gpio.c
View file

@ -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>

2
arch/arm/plat-samsung/s5p-irq-eint.c
View file

@ -14,7 +14,6 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/gpio.h>
#include <linux/irqchip/arm-vic.h>
#include <linux/of.h>
@ -26,6 +25,7 @@
#include <plat/gpio-cfg.h>
#include <mach/regs-gpio.h>
#include <mach/gpio-samsung.h>
static inline void s5p_irq_eint_mask(struct irq_data *data)
{

3
drivers/gpio/gpio-samsung.c
View file

@ -32,10 +32,7 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
#include <mach/gpio-samsung.h>
#endif
#include <plat/cpu.h>
#include <plat/gpio-core.h>

2
sound/soc/samsung/goni_wm8994.c
View file

@ -16,7 +16,7 @@
#include <sound/jack.h>
#include <asm/mach-types.h>
#include <mach/gpio.h>
#include <mach/gpio-samsung.h>
#include "../codecs/wm8994.h"