aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-07-14 18:59:27 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-15 06:17:11 -0400
commitef6f4b129bbbade7d06b0a9307b605cc78ca4b3b (patch)
treecdc4296bba740f895842dac351cd41e1d354ce01 /arch/arm/mach-versatile
parentd6ada8609b8548e528cd91a922338aff7c616820 (diff)
ARM: 6228/1: PL022 SSP platform data for the Versatile
This adds platform data for the PL022 to the ARM Versatile reference design, and adds the necessary clock definition. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r--arch/arm/mach-versatile/core.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 3dff8641b03..f3a0e073e9a 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
710static 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);
772AMBA_DEVICE(uart0, "dev:f1", UART0, NULL); 782AMBA_DEVICE(uart0, "dev:f1", UART0, NULL);
773AMBA_DEVICE(uart1, "dev:f2", UART1, NULL); 783AMBA_DEVICE(uart1, "dev:f2", UART1, NULL);
774AMBA_DEVICE(uart2, "dev:f3", UART2, NULL); 784AMBA_DEVICE(uart2, "dev:f3", UART2, NULL);
775AMBA_DEVICE(ssp0, "dev:f4", SSP, NULL); 785AMBA_DEVICE(ssp0, "dev:f4", SSP, &ssp0_plat_data);
776 786
777static struct amba_device *amba_devs[] __initdata = { 787static struct amba_device *amba_devs[] __initdata = {
778 &dmac_device, 788 &dmac_device,