Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f35ef7ca authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

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: default avatarHeiko Stuebner <heiko@sntech.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0f78b244

arch/arm/mach-s3c2440/mach-gta02.c

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

drivers/spi/spi-s3c24xx.c

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

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

+4 −5
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/spi.h

 *

/*

 * Copyright (c) 2006 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

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