diff options
author | Barry Song <barry.song@analog.com> | 2009-11-17 04:45:59 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-22 03:48:43 -0400 |
commit | f9f0e3b1f7ac4e9fa822e87dd4bbb38f8c389487 (patch) | |
tree | b0cad35d302e32bae4657909566d82bcb6eb1d7a /arch/blackfin | |
parent | 3d6437b35d68836b6ec4d45a24dfdafc61a27a84 (diff) |
Blackfin: bf537-stamp: update GPIO CS devices
Now that we've rewritten the GPIO CS handling in the Blackfin SPI
peripheral, we need to update the platform resources accordingly.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 68a27bccc7d4..a3f172fdda99 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -824,14 +824,12 @@ static struct bfin5xx_spi_chip lq035q1_spi_chip_info = { | |||
824 | static struct bfin5xx_spi_chip enc28j60_spi_chip_info = { | 824 | static struct bfin5xx_spi_chip enc28j60_spi_chip_info = { |
825 | .enable_dma = 1, | 825 | .enable_dma = 1, |
826 | .bits_per_word = 8, | 826 | .bits_per_word = 8, |
827 | .cs_gpio = GPIO_PF10, | ||
828 | }; | 827 | }; |
829 | #endif | 828 | #endif |
830 | 829 | ||
831 | #if defined(CONFIG_ADF702X) || defined(CONFIG_ADF702X_MODULE) | 830 | #if defined(CONFIG_ADF702X) || defined(CONFIG_ADF702X_MODULE) |
832 | static struct bfin5xx_spi_chip adf7021_spi_chip_info = { | 831 | static struct bfin5xx_spi_chip adf7021_spi_chip_info = { |
833 | .bits_per_word = 16, | 832 | .bits_per_word = 16, |
834 | .cs_gpio = GPIO_PF10, | ||
835 | }; | 833 | }; |
836 | 834 | ||
837 | #include <linux/spi/adf702x.h> | 835 | #include <linux/spi/adf702x.h> |
@@ -1103,7 +1101,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1103 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | 1101 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ |
1104 | .irq = IRQ_PF6, | 1102 | .irq = IRQ_PF6, |
1105 | .bus_num = 0, | 1103 | .bus_num = 0, |
1106 | .chip_select = 0, /* GPIO controlled SSEL */ | 1104 | .chip_select = GPIO_PF10 + MAX_CTRL_CS, /* GPIO controlled SSEL */ |
1107 | .controller_data = &enc28j60_spi_chip_info, | 1105 | .controller_data = &enc28j60_spi_chip_info, |
1108 | .mode = SPI_MODE_0, | 1106 | .mode = SPI_MODE_0, |
1109 | }, | 1107 | }, |
@@ -1125,7 +1123,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1125 | .modalias = "adf702x", | 1123 | .modalias = "adf702x", |
1126 | .max_speed_hz = 16000000, /* max spi clock (SCK) speed in HZ */ | 1124 | .max_speed_hz = 16000000, /* max spi clock (SCK) speed in HZ */ |
1127 | .bus_num = 0, | 1125 | .bus_num = 0, |
1128 | .chip_select = 0, /* GPIO controlled SSEL */ | 1126 | .chip_select = GPIO_PF10 + MAX_CTRL_CS, /* GPIO controlled SSEL */ |
1129 | .controller_data = &adf7021_spi_chip_info, | 1127 | .controller_data = &adf7021_spi_chip_info, |
1130 | .platform_data = &adf7021_platform_data, | 1128 | .platform_data = &adf7021_platform_data, |
1131 | .mode = SPI_MODE_0, | 1129 | .mode = SPI_MODE_0, |
@@ -1148,7 +1146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1148 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1146 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
1149 | /* SPI controller data */ | 1147 | /* SPI controller data */ |
1150 | static struct bfin5xx_spi_master bfin_spi0_info = { | 1148 | static struct bfin5xx_spi_master bfin_spi0_info = { |
1151 | .num_chipselect = 8, | 1149 | .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS, |
1152 | .enable_dma = 1, /* master has the ability to do dma transfer */ | 1150 | .enable_dma = 1, /* master has the ability to do dma transfer */ |
1153 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, | 1151 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, |
1154 | }; | 1152 | }; |