Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80748fb8 authored by Mark Brown's avatar Mark Brown Committed by Eric Miao
Browse files

[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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarIan Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 675b5d86

arch/arm/mach-pxa/e740.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <mach/udc.h>

#include <mach/irda.h>

#include <mach/irqs.h>

#include <mach/audio.h>



#include "generic.h"

#include "eseries.h"
@@ -197,6 +198,7 @@ static void __init e740_init(void) 
	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

	pxa_set_ac97_info(NULL);

	e7xx_irda_init();

	pxa_set_ficp_info(&e7xx_ficp_platform_data);

}

arch/arm/mach-pxa/e750.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <mach/udc.h>

#include <mach/irda.h>

#include <mach/irqs.h>

#include <mach/audio.h>



#include "generic.h"

#include "eseries.h"
@@ -198,6 +199,7 @@ static void __init e750_init(void) 
	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

	pxa_set_ac97_info(NULL);

	e7xx_irda_init();

	pxa_set_ficp_info(&e7xx_ficp_platform_data);

}

arch/arm/mach-pxa/e800.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <mach/eseries-gpio.h>

#include <mach/udc.h>

#include <mach/irqs.h>

#include <mach/audio.h>



#include "generic.h"

#include "eseries.h"
@@ -199,6 +200,7 @@ static void __init e800_init(void) 
	eseries_get_tmio_gpios();

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e800_udc_mach_info);

	pxa_set_ac97_info(NULL);

}



MACHINE_START(E800, "Toshiba e800")

arch/arm/mach-pxa/mioa701.c

+2 −4
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <mach/pxa27x-udc.h>

#include <mach/i2c.h>

#include <mach/camera.h>

#include <mach/audio.h>

#include <media/soc_camera.h>



#include <mach/mioa701.h>
@@ -763,8 +764,6 @@ MIO_PARENT_DEV(mioa701_backlight, "pwm-backlight", &pxa27x_device_pwm0.dev, 
		&mioa701_backlight_data);

MIO_SIMPLE_DEV(mioa701_led,	  "leds-gpio",	    &gpio_led_info)

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_board,	  "mioa701-board",  NULL)

MIO_SIMPLE_DEV(gpio_vbus,	  "gpio-vbus",      &gpio_vbus_data);
@@ -774,8 +773,6 @@ static struct platform_device *devices[] __initdata = { 
	&mioa701_backlight,

	&mioa701_led,

	&pxa2xx_pcm,

	&pxa2xx_ac97,

	&mio_wm9713_codec,

	&mioa701_sound,

	&power_dev,

	&strataflash,
@@ -818,6 +815,7 @@ static void __init mioa701_machine_init(void) 
	pxa_set_keypad_info(&mioa701_keypad_info);

	wm97xx_bat_set_pdata(&mioa701_battery_data);

	pxa_set_udc_info(&mioa701_udc_info);

	pxa_set_ac97_info(NULL);

	pm_power_off = mioa701_poweroff;

	arm_pm_restart = mioa701_restart;

	platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-pxa/tosa.c

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <mach/udc.h>

#include <mach/tosa_bt.h>

#include <mach/pxa2xx_spi.h>

#include <mach/audio.h>



#include <asm/mach/arch.h>

#include <mach/tosa.h>
@@ -914,6 +915,7 @@ static void __init tosa_init(void) 
	pxa_set_udc_info(&udc_info);

	pxa_set_ficp_info(&tosa_ficp_platform_data);

	pxa_set_i2c_info(NULL);

	pxa_set_ac97_info(NULL);

	platform_scoop_config = &tosa_pcmcia_config;



	pxa2xx_set_spi_info(2, &pxa_ssp_master_info);