diff options
| author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-11-19 17:11:05 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:05 +0000 |
| commit | 331a88d3fafe1dc3096ae10f33f0c3253962a8aa (patch) | |
| tree | e70a6fd0fff67b7b6112ca8fa0445a44b2e5f465 /arch | |
| parent | a610c47f0745c82e934f3859a3bea7dc7649cf1f (diff) | |
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 <jonas.bonn@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 11 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 2 |
3 files changed, 12 insertions, 3 deletions
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 <mach/fb.h> #include <mach/mci.h> #include <mach/spi.h> -#include <asm/arch/spi-gpio.h> +#include <mach/spi-gpio.h> #include <mach/usb-control.h> #include <mach/gta01.h> 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 <mach/mci.h> #include <mach/ts.h> #include <mach/spi.h> -#include <asm/arch-s3c2410/spi-gpio.h> +#include <mach/spi-gpio.h> #include <mach/usb-control.h> #include <mach/regs-mem.h> |