diff options
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/stamp.c')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index db96f33f72e2..a68ade8a3ca2 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -192,7 +192,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
192 | }; | 192 | }; |
193 | #endif | 193 | #endif |
194 | 194 | ||
195 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | 195 | #if defined(CONFIG_BFIN_SPI_ADC) || defined(CONFIG_BFIN_SPI_ADC_MODULE) |
196 | /* SPI ADC chip */ | 196 | /* SPI ADC chip */ |
197 | static struct bfin5xx_spi_chip spi_adc_chip_info = { | 197 | static struct bfin5xx_spi_chip spi_adc_chip_info = { |
198 | .enable_dma = 1, /* use dma transfer with this chip*/ | 198 | .enable_dma = 1, /* use dma transfer with this chip*/ |
@@ -237,7 +237,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
237 | }, | 237 | }, |
238 | #endif | 238 | #endif |
239 | 239 | ||
240 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | 240 | #if defined(CONFIG_BFIN_SPI_ADC) || defined(CONFIG_BFIN_SPI_ADC_MODULE) |
241 | { | 241 | { |
242 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 242 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
243 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 243 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
@@ -299,6 +299,11 @@ static struct resource bfin_spi0_resource[] = { | |||
299 | [1] = { | 299 | [1] = { |
300 | .start = CH_SPI, | 300 | .start = CH_SPI, |
301 | .end = CH_SPI, | 301 | .end = CH_SPI, |
302 | .flags = IORESOURCE_DMA, | ||
303 | }, | ||
304 | [2] = { | ||
305 | .start = IRQ_SPI, | ||
306 | .end = IRQ_SPI, | ||
302 | .flags = IORESOURCE_IRQ, | 307 | .flags = IORESOURCE_IRQ, |
303 | } | 308 | } |
304 | }; | 309 | }; |
@@ -448,7 +453,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
448 | .irq = 39, | 453 | .irq = 39, |
449 | }, | 454 | }, |
450 | #endif | 455 | #endif |
451 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 456 | #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
452 | { | 457 | { |
453 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 458 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
454 | }, | 459 | }, |