openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: S3C24XX: move spi-s3c24xx platdata out of mach 

spi.h now only contains the definition of the platform data structure
for the driver in spi-s3c24xx.c . Therefore it does not need to stay
in include/mach but can instead live in linux/spi/s3c24xx.h .

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Heiko Stuebner 2012-01-31 20:06:07 +09:00 committed by Kukjin Kim
parent 0f78b2443a
commit f35ef7cab2
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s3c2440/mach-gta02.c
View File

@ -38,6 +38,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/s3c24xx.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
@ -73,7 +74,6 @@
#include <mach/regs-gpioj.h> #include <mach/regs-gpioj.h>
#include <mach/fb.h> #include <mach/fb.h>
#include <mach/spi.h>
#include <plat/usb-control.h> #include <plat/usb-control.h>
#include <mach/regs-mem.h> #include <mach/regs-mem.h>
#include <mach/hardware.h> #include <mach/hardware.h>

2
drivers/spi/spi-s3c24xx.c
View File

@ -24,10 +24,10 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h> #include <linux/spi/spi_bitbang.h>
#include <linux/spi/s3c24xx.h>
#include <linux/module.h> #include <linux/module.h>
#include <plat/regs-spi.h> #include <plat/regs-spi.h>
#include <mach/spi.h>
#include <plat/fiq.h> #include <plat/fiq.h>
#include <asm/fiq.h> #include <asm/fiq.h>

9
arch/arm/mach-s3c2410/include/mach/spi.h → include/linux/spi/s3c24xx.h
View File

@ -1,5 +1,4 @@
/* arch/arm/mach-s3c2410/include/mach/spi.h /*
*
* Copyright (c) 2006 Simtec Electronics * Copyright (c) 2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
* *
@ -10,8 +9,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_ARCH_SPI_H #ifndef __LINUX_SPI_S3C24XX_H
#define __ASM_ARCH_SPI_H __FILE__ #define __LINUX_SPI_S3C24XX_H __FILE__
struct s3c2410_spi_info { struct s3c2410_spi_info {
int pin_cs; /* simple gpio cs */ int pin_cs; /* simple gpio cs */
@ -24,4 +23,4 @@ struct s3c2410_spi_info {
void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
}; };
#endif /* __ASM_ARCH_SPI_H */ #endif /* __LINUX_SPI_S3C24XX_H */