diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-03 07:45:49 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-04-04 09:54:40 -0400 |
commit | 80748fb8ff3bc068dccacb690cd2eb417b034ec7 (patch) | |
tree | 64738100257d71f62bf810fcb713071debef889c /arch/arm/mach-pxa/mioa701.c | |
parent | 675b5d869fe8f6f9cdb3c6758228f211fb1773e6 (diff) |
[ARM] pxa: register AC97 controller devices
The tosa, e740, e750, e800 and mioa701 all use AC97 audio codecs
but does not register the platform device for the AC97 controller.
Doing so is now required by ASoC.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/mioa701.c')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 97c93a7a285c..9203b069b35c 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <mach/pxa27x-udc.h> | 50 | #include <mach/pxa27x-udc.h> |
51 | #include <mach/i2c.h> | 51 | #include <mach/i2c.h> |
52 | #include <mach/camera.h> | 52 | #include <mach/camera.h> |
53 | #include <mach/audio.h> | ||
53 | #include <media/soc_camera.h> | 54 | #include <media/soc_camera.h> |
54 | 55 | ||
55 | #include <mach/mioa701.h> | 56 | #include <mach/mioa701.h> |
@@ -763,8 +764,6 @@ MIO_PARENT_DEV(mioa701_backlight, "pwm-backlight", &pxa27x_device_pwm0.dev, | |||
763 | &mioa701_backlight_data); | 764 | &mioa701_backlight_data); |
764 | MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info) | 765 | MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info) |
765 | MIO_SIMPLE_DEV(pxa2xx_pcm, "pxa2xx-pcm", NULL) | 766 | MIO_SIMPLE_DEV(pxa2xx_pcm, "pxa2xx-pcm", NULL) |
766 | MIO_SIMPLE_DEV(pxa2xx_ac97, "pxa2xx-ac97", NULL) | ||
767 | MIO_PARENT_DEV(mio_wm9713_codec, "wm9713-codec", &pxa2xx_ac97.dev, NULL) | ||
768 | MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) | 767 | MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) |
769 | MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) | 768 | MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) |
770 | MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data); | 769 | MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data); |
@@ -774,8 +773,6 @@ static struct platform_device *devices[] __initdata = { | |||
774 | &mioa701_backlight, | 773 | &mioa701_backlight, |
775 | &mioa701_led, | 774 | &mioa701_led, |
776 | &pxa2xx_pcm, | 775 | &pxa2xx_pcm, |
777 | &pxa2xx_ac97, | ||
778 | &mio_wm9713_codec, | ||
779 | &mioa701_sound, | 776 | &mioa701_sound, |
780 | &power_dev, | 777 | &power_dev, |
781 | &strataflash, | 778 | &strataflash, |
@@ -818,6 +815,7 @@ static void __init mioa701_machine_init(void) | |||
818 | pxa_set_keypad_info(&mioa701_keypad_info); | 815 | pxa_set_keypad_info(&mioa701_keypad_info); |
819 | wm97xx_bat_set_pdata(&mioa701_battery_data); | 816 | wm97xx_bat_set_pdata(&mioa701_battery_data); |
820 | pxa_set_udc_info(&mioa701_udc_info); | 817 | pxa_set_udc_info(&mioa701_udc_info); |
818 | pxa_set_ac97_info(NULL); | ||
821 | pm_power_off = mioa701_poweroff; | 819 | pm_power_off = mioa701_poweroff; |
822 | arm_pm_restart = mioa701_restart; | 820 | arm_pm_restart = mioa701_restart; |
823 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 821 | platform_add_devices(devices, ARRAY_SIZE(devices)); |