diff options
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> |