diff options
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/ezbrd.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 2ad68cd10ae6..68b4c804364c 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -263,15 +263,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { | |||
263 | }; | 263 | }; |
264 | #endif | 264 | #endif |
265 | 265 | ||
266 | #if defined(CONFIG_PBX) | ||
267 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | ||
268 | .ctl_reg = 0x4, /* send zero */ | ||
269 | .enable_dma = 0, | ||
270 | .bits_per_word = 8, | ||
271 | .cs_change_per_word = 1, | ||
272 | }; | ||
273 | #endif | ||
274 | |||
275 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 266 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
276 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 267 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
277 | .enable_dma = 0, | 268 | .enable_dma = 0, |
@@ -376,24 +367,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
376 | .mode = SPI_MODE_3, | 367 | .mode = SPI_MODE_3, |
377 | }, | 368 | }, |
378 | #endif | 369 | #endif |
379 | #if defined(CONFIG_PBX) | ||
380 | { | ||
381 | .modalias = "fxs-spi", | ||
382 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
383 | .bus_num = 0, | ||
384 | .chip_select = 8 - CONFIG_J11_JUMPER, | ||
385 | .controller_data = &spi_si3xxx_chip_info, | ||
386 | .mode = SPI_MODE_3, | ||
387 | }, | ||
388 | { | ||
389 | .modalias = "fxo-spi", | ||
390 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | ||
391 | .bus_num = 0, | ||
392 | .chip_select = 8 - CONFIG_J19_JUMPER, | ||
393 | .controller_data = &spi_si3xxx_chip_info, | ||
394 | .mode = SPI_MODE_3, | ||
395 | }, | ||
396 | #endif | ||
397 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 370 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
398 | { | 371 | { |
399 | .modalias = "ad7877", | 372 | .modalias = "ad7877", |
@@ -596,7 +569,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
596 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 569 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
597 | }, | 570 | }, |
598 | #endif | 571 | #endif |
599 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 572 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) |
600 | { | 573 | { |
601 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 574 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
602 | .irq = IRQ_PF8, | 575 | .irq = IRQ_PF8, |