diff options
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/ezkit.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index d0864111ef59..3e5b7db6b065 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -485,8 +485,8 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
485 | }; | 485 | }; |
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | #if defined(CONFIG_SPI_ADC_BF533) \ | 488 | #if defined(CONFIG_BFIN_SPI_ADC) \ |
489 | || defined(CONFIG_SPI_ADC_BF533_MODULE) | 489 | || defined(CONFIG_BFIN_SPI_ADC_MODULE) |
490 | /* SPI ADC chip */ | 490 | /* SPI ADC chip */ |
491 | static struct bfin5xx_spi_chip spi_adc_chip_info = { | 491 | static struct bfin5xx_spi_chip spi_adc_chip_info = { |
492 | .enable_dma = 1, /* use dma transfer with this chip*/ | 492 | .enable_dma = 1, /* use dma transfer with this chip*/ |
@@ -509,6 +509,13 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = { | |||
509 | }; | 509 | }; |
510 | #endif | 510 | #endif |
511 | 511 | ||
512 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | ||
513 | static struct bfin5xx_spi_chip mmc_spi_chip_info = { | ||
514 | .enable_dma = 0, | ||
515 | .bits_per_word = 8, | ||
516 | }; | ||
517 | #endif | ||
518 | |||
512 | #if defined(CONFIG_PBX) | 519 | #if defined(CONFIG_PBX) |
513 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { | 520 | static struct bfin5xx_spi_chip spi_si3xxx_chip_info = { |
514 | .ctl_reg = 0x4, /* send zero */ | 521 | .ctl_reg = 0x4, /* send zero */ |
@@ -593,8 +600,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
593 | }, | 600 | }, |
594 | #endif | 601 | #endif |
595 | 602 | ||
596 | #if defined(CONFIG_SPI_ADC_BF533) \ | 603 | #if defined(CONFIG_BFIN_SPI_ADC) \ |
597 | || defined(CONFIG_SPI_ADC_BF533_MODULE) | 604 | || defined(CONFIG_BFIN_SPI_ADC_MODULE) |
598 | { | 605 | { |
599 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 606 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
600 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 607 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
@@ -624,6 +631,17 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
624 | .controller_data = &ad9960_spi_chip_info, | 631 | .controller_data = &ad9960_spi_chip_info, |
625 | }, | 632 | }, |
626 | #endif | 633 | #endif |
634 | #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) | ||
635 | { | ||
636 | .modalias = "mmc_spi", | ||
637 | .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */ | ||
638 | .bus_num = 0, | ||
639 | .chip_select = 3, | ||
640 | .controller_data = &mmc_spi_chip_info, | ||
641 | .mode = SPI_MODE_0, | ||
642 | }, | ||
643 | #endif | ||
644 | |||
627 | #if defined(CONFIG_PBX) | 645 | #if defined(CONFIG_PBX) |
628 | { | 646 | { |
629 | .modalias = "fxs-spi", | 647 | .modalias = "fxs-spi", |
@@ -705,6 +723,11 @@ static struct resource bfin_spi0_resource[] = { | |||
705 | [1] = { | 723 | [1] = { |
706 | .start = CH_SPI, | 724 | .start = CH_SPI, |
707 | .end = CH_SPI, | 725 | .end = CH_SPI, |
726 | .flags = IORESOURCE_DMA, | ||
727 | }, | ||
728 | [2] = { | ||
729 | .start = IRQ_SPI, | ||
730 | .end = IRQ_SPI, | ||
708 | .flags = IORESOURCE_IRQ, | 731 | .flags = IORESOURCE_IRQ, |
709 | }, | 732 | }, |
710 | }; | 733 | }; |
@@ -836,7 +859,7 @@ static struct platform_device i2c_bfin_twi_device = { | |||
836 | #endif | 859 | #endif |
837 | 860 | ||
838 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 861 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
839 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 862 | #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
840 | { | 863 | { |
841 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 864 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
842 | }, | 865 | }, |