diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-pxa/eseries.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/stargate2.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 6 |
5 files changed, 45 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 66600f05e436..11f1e735966e 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -436,6 +436,14 @@ static struct platform_device corgiled_device = { | |||
436 | }; | 436 | }; |
437 | 437 | ||
438 | /* | 438 | /* |
439 | * Corgi Audio | ||
440 | */ | ||
441 | static struct platform_device corgi_audio_device = { | ||
442 | .name = "corgi-audio", | ||
443 | .id = -1, | ||
444 | }; | ||
445 | |||
446 | /* | ||
439 | * MMC/SD Device | 447 | * MMC/SD Device |
440 | * | 448 | * |
441 | * The card detect interrupt isn't debounced so we delay it by 250ms | 449 | * The card detect interrupt isn't debounced so we delay it by 250ms |
@@ -641,6 +649,7 @@ static struct platform_device *devices[] __initdata = { | |||
641 | &corgifb_device, | 649 | &corgifb_device, |
642 | &corgikbd_device, | 650 | &corgikbd_device, |
643 | &corgiled_device, | 651 | &corgiled_device, |
652 | &corgi_audio_device, | ||
644 | &sharpsl_nand_device, | 653 | &sharpsl_nand_device, |
645 | &sharpsl_rom_device, | 654 | &sharpsl_rom_device, |
646 | }; | 655 | }; |
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index f79a610c62fc..4cb2391a782e 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
@@ -528,12 +528,18 @@ static struct platform_device e740_t7l66xb_device = { | |||
528 | .resource = eseries_tmio_resources, | 528 | .resource = eseries_tmio_resources, |
529 | }; | 529 | }; |
530 | 530 | ||
531 | static struct platform_device e740_audio_device = { | ||
532 | .name = "e740-audio", | ||
533 | .id = -1, | ||
534 | }; | ||
535 | |||
531 | /* ----------------------------------------------------------------------- */ | 536 | /* ----------------------------------------------------------------------- */ |
532 | 537 | ||
533 | static struct platform_device *e740_devices[] __initdata = { | 538 | static struct platform_device *e740_devices[] __initdata = { |
534 | &e740_fb_device, | 539 | &e740_fb_device, |
535 | &e740_t7l66xb_device, | 540 | &e740_t7l66xb_device, |
536 | &e7xx_gpio_vbus, | 541 | &e7xx_gpio_vbus, |
542 | &e740_audio_device, | ||
537 | }; | 543 | }; |
538 | 544 | ||
539 | static void __init e740_init(void) | 545 | static void __init e740_init(void) |
@@ -722,12 +728,18 @@ static struct platform_device e750_tc6393xb_device = { | |||
722 | .resource = eseries_tmio_resources, | 728 | .resource = eseries_tmio_resources, |
723 | }; | 729 | }; |
724 | 730 | ||
731 | static struct platform_device e750_audio_device = { | ||
732 | .name = "e750-audio", | ||
733 | .id = -1, | ||
734 | }; | ||
735 | |||
725 | /* ------------------------------------------------------------- */ | 736 | /* ------------------------------------------------------------- */ |
726 | 737 | ||
727 | static struct platform_device *e750_devices[] __initdata = { | 738 | static struct platform_device *e750_devices[] __initdata = { |
728 | &e750_fb_device, | 739 | &e750_fb_device, |
729 | &e750_tc6393xb_device, | 740 | &e750_tc6393xb_device, |
730 | &e7xx_gpio_vbus, | 741 | &e7xx_gpio_vbus, |
742 | &e750_audio_device, | ||
731 | }; | 743 | }; |
732 | 744 | ||
733 | static void __init e750_init(void) | 745 | static void __init e750_init(void) |
@@ -929,12 +941,18 @@ static struct platform_device e800_tc6393xb_device = { | |||
929 | .resource = eseries_tmio_resources, | 941 | .resource = eseries_tmio_resources, |
930 | }; | 942 | }; |
931 | 943 | ||
944 | static struct platform_device e800_audio_device = { | ||
945 | .name = "e800-audio", | ||
946 | .id = -1, | ||
947 | }; | ||
948 | |||
932 | /* ----------------------------------------------------------------------- */ | 949 | /* ----------------------------------------------------------------------- */ |
933 | 950 | ||
934 | static struct platform_device *e800_devices[] __initdata = { | 951 | static struct platform_device *e800_devices[] __initdata = { |
935 | &e800_fb_device, | 952 | &e800_fb_device, |
936 | &e800_tc6393xb_device, | 953 | &e800_tc6393xb_device, |
937 | &e800_gpio_vbus, | 954 | &e800_gpio_vbus, |
955 | &e800_audio_device, | ||
938 | }; | 956 | }; |
939 | 957 | ||
940 | static void __init e800_init(void) | 958 | static void __init e800_init(void) |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 69036e42ca31..744baee12c0c 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = { | |||
158 | EXPORT_SYMBOL(poodle_scoop_device); | 158 | EXPORT_SYMBOL(poodle_scoop_device); |
159 | 159 | ||
160 | 160 | ||
161 | static struct platform_device poodle_audio_device = { | ||
162 | .name = "poodle-audio", | ||
163 | .id = -1, | ||
164 | }; | ||
165 | |||
161 | /* LoCoMo device */ | 166 | /* LoCoMo device */ |
162 | static struct resource locomo_resources[] = { | 167 | static struct resource locomo_resources[] = { |
163 | [0] = { | 168 | [0] = { |
@@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = { | |||
407 | static struct platform_device *devices[] __initdata = { | 412 | static struct platform_device *devices[] __initdata = { |
408 | &poodle_locomo_device, | 413 | &poodle_locomo_device, |
409 | &poodle_scoop_device, | 414 | &poodle_scoop_device, |
415 | &poodle_audio_device, | ||
410 | &sharpsl_nand_device, | 416 | &sharpsl_nand_device, |
411 | &sharpsl_rom_device, | 417 | &sharpsl_rom_device, |
412 | }; | 418 | }; |
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index d8a2467de92e..b0656e158d90 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c | |||
@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = { | |||
593 | .udc_command = sg2_udc_command, | 593 | .udc_command = sg2_udc_command, |
594 | }; | 594 | }; |
595 | 595 | ||
596 | static struct platform_device imote2_audio_device = { | ||
597 | .name = "imote2-audio", | ||
598 | .id = -1, | ||
599 | }; | ||
600 | |||
596 | static struct platform_device *imote2_devices[] = { | 601 | static struct platform_device *imote2_devices[] = { |
597 | &stargate2_flash_device, | 602 | &stargate2_flash_device, |
598 | &imote2_leds, | 603 | &imote2_leds, |
599 | &sht15, | 604 | &sht15, |
605 | &imote2_audio_device, | ||
600 | }; | 606 | }; |
601 | 607 | ||
602 | static void __init imote2_init(void) | 608 | static void __init imote2_init(void) |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 7ce5c436cc4e..4d4eb60bad1e 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -889,6 +889,11 @@ static struct platform_device wm9712_device = { | |||
889 | .id = -1, | 889 | .id = -1, |
890 | }; | 890 | }; |
891 | 891 | ||
892 | static struct platform_device tosa_audio_device = { | ||
893 | .name = "tosa-audio", | ||
894 | .id = -1, | ||
895 | }; | ||
896 | |||
892 | static struct platform_device *devices[] __initdata = { | 897 | static struct platform_device *devices[] __initdata = { |
893 | &tosascoop_device, | 898 | &tosascoop_device, |
894 | &tosascoop_jc_device, | 899 | &tosascoop_jc_device, |
@@ -901,6 +906,7 @@ static struct platform_device *devices[] __initdata = { | |||
901 | &sharpsl_rom_device, | 906 | &sharpsl_rom_device, |
902 | &wm9712_device, | 907 | &wm9712_device, |
903 | &tosa_gpio_vbus, | 908 | &tosa_gpio_vbus, |
909 | &tosa_audio_device, | ||
904 | }; | 910 | }; |
905 | 911 | ||
906 | static void tosa_poweroff(void) | 912 | static void tosa_poweroff(void) |