From 331a88d3fafe1dc3096ae10f33f0c3253962a8aa Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Wed, 19 Nov 2008 17:11:05 +0000 Subject: Carry over changes to spi-gpio.h This patch carries over the OpenMoko modifications at include/asm-arm/arch-s3c2410/spi-gpio.h to arch/arm/mach-s3c2410/include/mach/spi-gpio.h Note: board_size and board_info have been removed upstream, but as we still rely on them we'll just put them back for now. These will need to be removed (and the corresponding driver changes made, of course) before this can go upstream. Signed-off-by: Jonas Bonn --- arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 11 ++++++++++- arch/arm/mach-s3c2410/mach-gta01.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h index 3fe8be9ca11..996498e9160 100644 --- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h @@ -19,8 +19,17 @@ struct s3c2410_spigpio_info { unsigned long pin_miso; int bus_num; + int num_chipselect; - void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); + /* + * FIXME: board_size and board_info DO NOT belong here. + * These were already removed upstream... but we still rely on them + * so leave for now and revisit this. + */ + unsigned long board_size; + struct spi_board_info *board_info; + + void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs); }; diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 83c29eb56b5..47377bd3da0 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index a5d3389eca4..db0965dd064 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.3