Commit 2fd48f94 authored by Linus Walleij's avatar Linus Walleij
Browse files

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



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: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ab275b13

arch/arm/Kconfig

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

arch/arm/mach-s5p64x0/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+2 −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,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)

{

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

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

 *

/*

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

 *		http://www.samsung.com

 *

arch/arm/mach-s5p64x0/mach-smdk6440.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE