Skip to content

Commit

Permalink
ARM: S3C24XX: move spi-s3c24xx platdata out of mach
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiko Stuebner authored and Kukjin Kim committed Jan 31, 2012
1 parent 0f78b24 commit f35ef7c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2440/mach-gta02.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <linux/platform_device.h>
#include <linux/serial_core.h>
#include <linux/spi/spi.h>
#include <linux/spi/s3c24xx.h>

#include <linux/mmc/host.h>

Expand Down Expand Up @@ -73,7 +74,6 @@
#include <mach/regs-gpioj.h>
#include <mach/fb.h>

#include <mach/spi.h>
#include <plat/usb-control.h>
#include <mach/regs-mem.h>
#include <mach/hardware.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-s3c24xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

#include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h>
#include <linux/spi/s3c24xx.h>
#include <linux/module.h>

#include <plat/regs-spi.h>
#include <mach/spi.h>

#include <plat/fiq.h>
#include <asm/fiq.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* arch/arm/mach-s3c2410/include/mach/spi.h
*
/*
* Copyright (c) 2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
Expand All @@ -10,8 +9,8 @@
* published by the Free Software Foundation.
*/

#ifndef __ASM_ARCH_SPI_H
#define __ASM_ARCH_SPI_H __FILE__
#ifndef __LINUX_SPI_S3C24XX_H
#define __LINUX_SPI_S3C24XX_H __FILE__

struct s3c2410_spi_info {
int pin_cs; /* simple gpio cs */
Expand All @@ -24,4 +23,4 @@ struct s3c2410_spi_info {
void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
};

#endif /* __ASM_ARCH_SPI_H */
#endif /* __LINUX_SPI_S3C24XX_H */

0 comments on commit f35ef7c

Please sign in to comment.