diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/devices.c | 25 | ||||
-rw-r--r-- | arch/arm/mach-pxa/devices.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 11 |
5 files changed, 51 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 08b410343870..aaa1166df964 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -382,6 +382,31 @@ struct platform_device pxa_device_i2s = { | |||
382 | .num_resources = ARRAY_SIZE(pxai2s_resources), | 382 | .num_resources = ARRAY_SIZE(pxai2s_resources), |
383 | }; | 383 | }; |
384 | 384 | ||
385 | struct platform_device pxa_device_asoc_ssp1 = { | ||
386 | .name = "pxa-ssp-dai", | ||
387 | .id = 0, | ||
388 | }; | ||
389 | |||
390 | struct platform_device pxa_device_asoc_ssp2= { | ||
391 | .name = "pxa-ssp-dai", | ||
392 | .id = 1, | ||
393 | }; | ||
394 | |||
395 | struct platform_device pxa_device_asoc_ssp3 = { | ||
396 | .name = "pxa-ssp-dai", | ||
397 | .id = 2, | ||
398 | }; | ||
399 | |||
400 | struct platform_device pxa_device_asoc_ssp4 = { | ||
401 | .name = "pxa-ssp-dai", | ||
402 | .id = 3, | ||
403 | }; | ||
404 | |||
405 | struct platform_device pxa_device_asoc_platform = { | ||
406 | .name = "pxa-pcm-audio", | ||
407 | .id = -1, | ||
408 | }; | ||
409 | |||
385 | static u64 pxaficp_dmamask = ~(u32)0; | 410 | static u64 pxaficp_dmamask = ~(u32)0; |
386 | 411 | ||
387 | struct platform_device pxa_device_ficp = { | 412 | struct platform_device pxa_device_ficp = { |
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 715e8bd02e24..2fd5a8b35757 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h | |||
@@ -39,4 +39,10 @@ extern struct platform_device pxa3xx_device_i2c_power; | |||
39 | 39 | ||
40 | extern struct platform_device pxa3xx_device_gcu; | 40 | extern struct platform_device pxa3xx_device_gcu; |
41 | 41 | ||
42 | extern struct platform_device pxa_device_asoc_platform; | ||
43 | extern struct platform_device pxa_device_asoc_ssp1; | ||
44 | extern struct platform_device pxa_device_asoc_ssp2; | ||
45 | extern struct platform_device pxa_device_asoc_ssp3; | ||
46 | extern struct platform_device pxa_device_asoc_ssp4; | ||
47 | |||
42 | void __init pxa_register_device(struct platform_device *dev, void *data); | 48 | void __init pxa_register_device(struct platform_device *dev, void *data); |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 12e5b9f01e6f..d1fbf29d561c 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -385,6 +385,10 @@ static struct platform_device *devices[] __initdata = { | |||
385 | &pxa27x_device_udc, | 385 | &pxa27x_device_udc, |
386 | &pxa_device_pmu, | 386 | &pxa_device_pmu, |
387 | &pxa_device_i2s, | 387 | &pxa_device_i2s, |
388 | &pxa_device_asoc_ssp1, | ||
389 | &pxa_device_asoc_ssp2, | ||
390 | &pxa_device_asoc_ssp3, | ||
391 | &pxa_device_asoc_platform, | ||
388 | &sa1100_device_rtc, | 392 | &sa1100_device_rtc, |
389 | &pxa_device_rtc, | 393 | &pxa_device_rtc, |
390 | &pxa27x_device_ssp1, | 394 | &pxa27x_device_ssp1, |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index c85c3a7abd31..d1c747cdacf8 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -593,6 +593,11 @@ static struct platform_device *devices[] __initdata = { | |||
593 | &pxa27x_device_udc, | 593 | &pxa27x_device_udc, |
594 | &pxa_device_pmu, | 594 | &pxa_device_pmu, |
595 | &pxa_device_i2s, | 595 | &pxa_device_i2s, |
596 | &pxa_device_asoc_ssp1, | ||
597 | &pxa_device_asoc_ssp2, | ||
598 | &pxa_device_asoc_ssp3, | ||
599 | &pxa_device_asoc_ssp4, | ||
600 | &pxa_device_asoc_platform, | ||
596 | &sa1100_device_rtc, | 601 | &sa1100_device_rtc, |
597 | &pxa_device_rtc, | 602 | &pxa_device_rtc, |
598 | &pxa27x_device_ssp1, | 603 | &pxa27x_device_ssp1, |
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index f25fb6245bd7..702f7a68e87d 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -45,6 +45,16 @@ int wm9713_irq; | |||
45 | int lcd_id; | 45 | int lcd_id; |
46 | int lcd_orientation; | 46 | int lcd_orientation; |
47 | 47 | ||
48 | struct platform_device pxa_device_wm9713_audio = { | ||
49 | .name = "wm9713-codec", | ||
50 | .id = -1, | ||
51 | }; | ||
52 | |||
53 | static void __init zylonite_init_wm9713_audio(void) | ||
54 | { | ||
55 | platform_device_register(&pxa_device_wm9713_audio); | ||
56 | } | ||
57 | |||
48 | static struct resource smc91x_resources[] = { | 58 | static struct resource smc91x_resources[] = { |
49 | [0] = { | 59 | [0] = { |
50 | .start = ZYLONITE_ETH_PHYS + 0x300, | 60 | .start = ZYLONITE_ETH_PHYS + 0x300, |
@@ -408,6 +418,7 @@ static void __init zylonite_init(void) | |||
408 | zylonite_init_nand(); | 418 | zylonite_init_nand(); |
409 | zylonite_init_leds(); | 419 | zylonite_init_leds(); |
410 | zylonite_init_ohci(); | 420 | zylonite_init_ohci(); |
421 | zylonite_init_wm9713_audio(); | ||
411 | } | 422 | } |
412 | 423 | ||
413 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") | 424 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") |