diff options
| -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 | ||||
| -rw-r--r-- | drivers/spi/spi_s3c24xx_gpio.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c2410/spi-gpio.h | 31 |
5 files changed, 13 insertions, 35 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> diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index 47da353cf67..b41de422cb4 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -22,7 +22,7 @@ #include <linux/spi/spi_bitbang.h> #include <mach/regs-gpio.h> -#include <asm/arch-s3c2410/spi-gpio.h> +#include <mach/spi-gpio.h> #include <mach/hardware.h> struct s3c2410_spigpio { diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h deleted file mode 100644 index d4efc973f18..00000000000 --- a/include/asm-arm/arch-s3c2410/spi-gpio.h +++ /dev/null @@ -1,31 +0,0 @@ -/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h - * - * Copyright (c) 2006 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * - * S3C2410 - SPI Controller platfrom_device info - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_SPIGPIO_H -#define __ASM_ARCH_SPIGPIO_H __FILE__ - -struct s3c2410_spigpio_info { - unsigned long pin_clk; - unsigned long pin_mosi; - unsigned long pin_miso; - - int bus_num; - int num_chipselect; - - unsigned long board_size; - struct spi_board_info *board_info; - - void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs); -}; - - -#endif /* __ASM_ARCH_SPIGPIO_H */ |