lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] pxa: register AC97 controller devices

Browse Source 
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>
This commit is contained in:
Mark Brown
2009-04-03 12:45:49 +01:00
committed by Eric Miao
parent 675b5d869f
commit 80748fb8ff
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/e740.c
View File

@@ -29,6 +29,7 @@
#include <mach/udc.h> #include <mach/udc.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/audio.h>
#include "generic.h" #include "generic.h"
#include "eseries.h" #include "eseries.h"
@@ -197,6 +198,7 @@ static void __init e740_init(void)
eseries_get_tmio_gpios(); eseries_get_tmio_gpios();
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_udc_info(&e7xx_udc_mach_info); pxa_set_udc_info(&e7xx_udc_mach_info);
pxa_set_ac97_info(NULL);
e7xx_irda_init(); e7xx_irda_init();
pxa_set_ficp_info(&e7xx_ficp_platform_data); pxa_set_ficp_info(&e7xx_ficp_platform_data);
} }

2
arch/arm/mach-pxa/e750.c
View File

@@ -28,6 +28,7 @@
#include <mach/udc.h> #include <mach/udc.h>
#include <mach/irda.h> #include <mach/irda.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/audio.h>
#include "generic.h" #include "generic.h"
#include "eseries.h" #include "eseries.h"
@@ -198,6 +199,7 @@ static void __init e750_init(void)
eseries_get_tmio_gpios(); eseries_get_tmio_gpios();
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_udc_info(&e7xx_udc_mach_info); pxa_set_udc_info(&e7xx_udc_mach_info);
pxa_set_ac97_info(NULL);
e7xx_irda_init(); e7xx_irda_init();
pxa_set_ficp_info(&e7xx_ficp_platform_data); pxa_set_ficp_info(&e7xx_ficp_platform_data);
} }

2
arch/arm/mach-pxa/e800.c
View File

@@ -27,6 +27,7 @@
#include <mach/eseries-gpio.h> #include <mach/eseries-gpio.h>
#include <mach/udc.h> #include <mach/udc.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/audio.h>
#include "generic.h" #include "generic.h"
#include "eseries.h" #include "eseries.h"
@@ -199,6 +200,7 @@ static void __init e800_init(void)
eseries_get_tmio_gpios(); eseries_get_tmio_gpios();
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));
pxa_set_udc_info(&e800_udc_mach_info); pxa_set_udc_info(&e800_udc_mach_info);
pxa_set_ac97_info(NULL);
} }
MACHINE_START(E800, "Toshiba e800") MACHINE_START(E800, "Toshiba e800")

6
arch/arm/mach-pxa/mioa701.c
View File

@@ -50,6 +50,7 @@
#include <mach/pxa27x-udc.h> #include <mach/pxa27x-udc.h>
#include <mach/i2c.h> #include <mach/i2c.h>
#include <mach/camera.h> #include <mach/camera.h>
#include <mach/audio.h>
#include <media/soc_camera.h> #include <media/soc_camera.h>
#include <mach/mioa701.h> #include <mach/mioa701.h>
@@ -763,8 +764,6 @@ MIO_PARENT_DEV(mioa701_backlight, "pwm-backlight", &pxa27x_device_pwm0.dev,
&mioa701_backlight_data); &mioa701_backlight_data);
MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info) MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info)
MIO_SIMPLE_DEV(pxa2xx_pcm, "pxa2xx-pcm", NULL) MIO_SIMPLE_DEV(pxa2xx_pcm, "pxa2xx-pcm", NULL)
MIO_SIMPLE_DEV(pxa2xx_ac97, "pxa2xx-ac97", NULL)
MIO_PARENT_DEV(mio_wm9713_codec, "wm9713-codec", &pxa2xx_ac97.dev, NULL)
MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL)
MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL)
MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data); MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data);
@@ -774,8 +773,6 @@ static struct platform_device *devices[] __initdata = {
&mioa701_backlight, &mioa701_backlight,
&mioa701_led, &mioa701_led,
&pxa2xx_pcm, &pxa2xx_pcm,
&pxa2xx_ac97,
&mio_wm9713_codec,
&mioa701_sound, &mioa701_sound,
&power_dev, &power_dev,
&strataflash, &strataflash,
@@ -818,6 +815,7 @@ static void __init mioa701_machine_init(void)
pxa_set_keypad_info(&mioa701_keypad_info); pxa_set_keypad_info(&mioa701_keypad_info);
wm97xx_bat_set_pdata(&mioa701_battery_data); wm97xx_bat_set_pdata(&mioa701_battery_data);
pxa_set_udc_info(&mioa701_udc_info); pxa_set_udc_info(&mioa701_udc_info);
pxa_set_ac97_info(NULL);
pm_power_off = mioa701_poweroff; pm_power_off = mioa701_poweroff;
arm_pm_restart = mioa701_restart; arm_pm_restart = mioa701_restart;
platform_add_devices(devices, ARRAY_SIZE(devices)); platform_add_devices(devices, ARRAY_SIZE(devices));

2
arch/arm/mach-pxa/tosa.c
View File

@@ -45,6 +45,7 @@
#include <mach/udc.h> #include <mach/udc.h>
#include <mach/tosa_bt.h> #include <mach/tosa_bt.h>
#include <mach/pxa2xx_spi.h> #include <mach/pxa2xx_spi.h>
#include <mach/audio.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/tosa.h> #include <mach/tosa.h>
@@ -914,6 +915,7 @@ static void __init tosa_init(void)
pxa_set_udc_info(&udc_info); pxa_set_udc_info(&udc_info);
pxa_set_ficp_info(&tosa_ficp_platform_data); pxa_set_ficp_info(&tosa_ficp_platform_data);
pxa_set_i2c_info(NULL); pxa_set_i2c_info(NULL);
pxa_set_ac97_info(NULL);
platform_scoop_config = &tosa_pcmcia_config; platform_scoop_config = &tosa_pcmcia_config;
pxa2xx_set_spi_info(2, &pxa_ssp_master_info); pxa2xx_set_spi_info(2, &pxa_ssp_master_info);