diff options
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 3dff8641b03f..f3a0e073e9ae 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/amba/clcd.h> | 28 | #include <linux/amba/clcd.h> |
| 29 | #include <linux/amba/pl061.h> | 29 | #include <linux/amba/pl061.h> |
| 30 | #include <linux/amba/mmci.h> | 30 | #include <linux/amba/mmci.h> |
| 31 | #include <linux/amba/pl022.h> | ||
| 31 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 32 | #include <linux/gfp.h> | 33 | #include <linux/gfp.h> |
| 33 | 34 | ||
| @@ -425,6 +426,9 @@ static struct clk_lookup lookups[] = { | |||
| 425 | }, { /* MMC1 */ | 426 | }, { /* MMC1 */ |
| 426 | .dev_id = "fpga:0b", | 427 | .dev_id = "fpga:0b", |
| 427 | .clk = &ref24_clk, | 428 | .clk = &ref24_clk, |
| 429 | }, { /* SSP */ | ||
| 430 | .dev_id = "dev:f4", | ||
| 431 | .clk = &ref24_clk, | ||
| 428 | }, { /* CLCD */ | 432 | }, { /* CLCD */ |
| 429 | .dev_id = "dev:20", | 433 | .dev_id = "dev:20", |
| 430 | .clk = &osc4_clk, | 434 | .clk = &osc4_clk, |
| @@ -703,6 +707,12 @@ static struct pl061_platform_data gpio1_plat_data = { | |||
| 703 | .irq_base = IRQ_GPIO1_START, | 707 | .irq_base = IRQ_GPIO1_START, |
| 704 | }; | 708 | }; |
| 705 | 709 | ||
| 710 | static struct pl022_ssp_controller ssp0_plat_data = { | ||
| 711 | .bus_id = 0, | ||
| 712 | .enable_dma = 0, | ||
| 713 | .num_chipselect = 1, | ||
| 714 | }; | ||
| 715 | |||
| 706 | #define AACI_IRQ { IRQ_AACI, NO_IRQ } | 716 | #define AACI_IRQ { IRQ_AACI, NO_IRQ } |
| 707 | #define AACI_DMA { 0x80, 0x81 } | 717 | #define AACI_DMA { 0x80, 0x81 } |
| 708 | #define MMCI0_IRQ { IRQ_MMCI0A,IRQ_SIC_MMCI0B } | 718 | #define MMCI0_IRQ { IRQ_MMCI0A,IRQ_SIC_MMCI0B } |
| @@ -772,7 +782,7 @@ AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | |||
| 772 | AMBA_DEVICE(uart0, "dev:f1", UART0, NULL); | 782 | AMBA_DEVICE(uart0, "dev:f1", UART0, NULL); |
| 773 | AMBA_DEVICE(uart1, "dev:f2", UART1, NULL); | 783 | AMBA_DEVICE(uart1, "dev:f2", UART1, NULL); |
| 774 | AMBA_DEVICE(uart2, "dev:f3", UART2, NULL); | 784 | AMBA_DEVICE(uart2, "dev:f3", UART2, NULL); |
| 775 | AMBA_DEVICE(ssp0, "dev:f4", SSP, NULL); | 785 | AMBA_DEVICE(ssp0, "dev:f4", SSP, &ssp0_plat_data); |
| 776 | 786 | ||
| 777 | static struct amba_device *amba_devs[] __initdata = { | 787 | static struct amba_device *amba_devs[] __initdata = { |
| 778 | &dmac_device, | 788 | &dmac_device, |
