mirror of
https://github.com/torvalds/linux
synced 2024-09-22 03:55:39 +00:00
ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h
Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that it can be included by <plat/gpio-core.h> when needed. Eliminate all other empty gpio-core.h files and just include the <plat/gpio-core.h> as necessary. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Ben Dooks
parent
16e2c7c59f
commit
e856bb1f8d
|
|
@ -15,7 +15,6 @@
|
|||
#ifndef __ASM_ARCH_GPIO_CORE_H
|
||||
#define __ASM_ARCH_GPIO_CORE_H __FILE__
|
||||
|
||||
#include <plat/gpio-core.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
extern struct s3c_gpio_chip s3c24xx_gpios[];
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* arch/arm/mach-s3c6400/include/mach/gpio-core.h
|
||||
*
|
||||
* Copyright 2008 Openmoko, Inc.
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
* http://armlinux.simtec.co.uk/
|
||||
*
|
||||
* S3C64XX - GPIO core support
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_GPIO_CORE_H
|
||||
#define __ASM_ARCH_GPIO_CORE_H __FILE__
|
||||
|
||||
/* currently we just include the platform support */
|
||||
#include <plat/gpio-core.h>
|
||||
|
||||
#endif /* __ASM_ARCH_GPIO_CORE_H */
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
/* linux/arch/arm/mach-s5p6440/include/mach/gpio-core.h
|
||||
*
|
||||
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
|
||||
* http://www.samsung.com/
|
||||
*
|
||||
* S5P6440 - GPIO core support
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_GPIO_CORE_H
|
||||
#define __ASM_ARCH_GPIO_CORE_H __FILE__
|
||||
|
||||
/* currently we just include the platform support */
|
||||
#include <plat/gpio-core.h>
|
||||
|
||||
#endif /* __ASM_ARCH_GPIO_CORE_H */
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
/* arch/arm/mach-s5pc100/include/mach/gpio-core.h
|
||||
*
|
||||
* Copyright 2009 Samsung Electronics Co.
|
||||
* Byungho Min <bhmin@samsung.com>
|
||||
*
|
||||
* S5PC100 - GPIO core support
|
||||
*
|
||||
* Based on mach-s3c6400/include/mach/gpio-core.h
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_GPIO_CORE_H
|
||||
#define __ASM_ARCH_GPIO_CORE_H __FILE__
|
||||
|
||||
/* currently we just include the platform support */
|
||||
#include <plat/gpio-core.h>
|
||||
|
||||
#endif /* __ASM_ARCH_GPIO_CORE_H */
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <mach/gpio-core.h>
|
||||
#include <plat/gpio-core.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
#include <plat/pm.h>
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
|
||||
#include <mach/map.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/gpio-core.h>
|
||||
|
||||
#include <plat/gpio-core.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
#include <plat/gpio-cfg-helpers.h>
|
||||
#include <plat/regs-gpio.h>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <mach/gpio-core.h>
|
||||
#include <plat/gpio-core.h>
|
||||
#include <plat/gpio-cfg-s5pc1xx.h>
|
||||
|
||||
s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin, unsigned int off)
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
#include <linux/gpio.h>
|
||||
|
||||
#include <mach/map.h>
|
||||
#include <mach/gpio-core.h>
|
||||
|
||||
#include <plat/gpio-core.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
#include <plat/gpio-cfg-helpers.h>
|
||||
#include <plat/regs-gpio.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <mach/gpio-core.h>
|
||||
#include <plat/gpio-core.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
#include <plat/gpio-cfg-helpers.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <mach/gpio-core.h>
|
||||
#include <plat/gpio-core.h>
|
||||
|
||||
#ifdef CONFIG_S3C_GPIO_TRACK
|
||||
struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END];
|
||||
|
|
|
|||
|
|
@ -118,6 +118,8 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int chip)
|
|||
#else
|
||||
/* machine specific code should provide s3c_gpiolib_getchip */
|
||||
|
||||
#include <mach/gpio-track.h>
|
||||
|
||||
static inline void s3c_gpiolib_track(struct s3c_gpio_chip *chip) { }
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <mach/gpio-core.h>
|
||||
#include <plat/gpio-core.h>
|
||||
#include <plat/pm.h>
|
||||
|
||||
/* PM GPIO helpers */
|
||||
|
|
|
|||
Loading…
Reference in a new issue