diff options
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/ezkit.c')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 14860f04d1bd..916e963e83ba 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -37,7 +37,9 @@ | |||
37 | #include <linux/spi/flash.h> | 37 | #include <linux/spi/flash.h> |
38 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
40 | #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) | ||
40 | #include <linux/usb/musb.h> | 41 | #include <linux/usb/musb.h> |
42 | #endif | ||
41 | #include <asm/bfin5xx_spi.h> | 43 | #include <asm/bfin5xx_spi.h> |
42 | #include <asm/cplb.h> | 44 | #include <asm/cplb.h> |
43 | #include <asm/dma.h> | 45 | #include <asm/dma.h> |
@@ -420,6 +422,13 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { | |||
420 | }; | 422 | }; |
421 | #endif | 423 | #endif |
422 | 424 | ||
425 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | ||
426 | static struct bfin5xx_spi_chip spidev_chip_info = { | ||
427 | .enable_dma = 0, | ||
428 | .bits_per_word = 8, | ||
429 | }; | ||
430 | #endif | ||
431 | |||
423 | static struct spi_board_info bf54x_spi_board_info[] __initdata = { | 432 | static struct spi_board_info bf54x_spi_board_info[] __initdata = { |
424 | #if defined(CONFIG_MTD_M25P80) \ | 433 | #if defined(CONFIG_MTD_M25P80) \ |
425 | || defined(CONFIG_MTD_M25P80_MODULE) | 434 | || defined(CONFIG_MTD_M25P80_MODULE) |
@@ -445,6 +454,15 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = { | |||
445 | .controller_data = &spi_ad7877_chip_info, | 454 | .controller_data = &spi_ad7877_chip_info, |
446 | }, | 455 | }, |
447 | #endif | 456 | #endif |
457 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | ||
458 | { | ||
459 | .modalias = "spidev", | ||
460 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | ||
461 | .bus_num = 0, | ||
462 | .chip_select = 1, | ||
463 | .controller_data = &spidev_chip_info, | ||
464 | }, | ||
465 | #endif | ||
448 | }; | 466 | }; |
449 | 467 | ||
450 | /* SPI (0) */ | 468 | /* SPI (0) */ |
@@ -631,7 +649,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
631 | &ezkit_flash_device, | 649 | &ezkit_flash_device, |
632 | }; | 650 | }; |
633 | 651 | ||
634 | static int __init stamp_init(void) | 652 | static int __init ezkit_init(void) |
635 | { | 653 | { |
636 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 654 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); |
637 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 655 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
@@ -644,4 +662,4 @@ static int __init stamp_init(void) | |||
644 | return 0; | 662 | return 0; |
645 | } | 663 | } |
646 | 664 | ||
647 | arch_initcall(stamp_init); | 665 | arch_initcall(ezkit_init); |