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

Commit f0fba2ad authored by Liam Girdwood's avatar Liam Girdwood
Browse files

ASoC: multi-component - ASoC Multi-Component Support 



This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.

 struct snd_soc_codec    --->  struct snd_soc_codec (device data)
                          +->  struct snd_soc_codec_driver (driver data)

 struct snd_soc_platform --->  struct snd_soc_platform (device data)
                          +->  struct snd_soc_platform_driver (driver data)

 struct snd_soc_dai      --->  struct snd_soc_dai (device data)
                          +->  struct snd_soc_dai_driver (driver data)

 struct snd_soc_device   --->  deleted

This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.

The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.

This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.

Other notable multi-component changes:-

 * Stream operations now de-reference less structures.
 * close_delayed work() now runs on a DAI basis rather than looping all DAIs
   in a card.
 * PM suspend()/resume() operations can now handle N CODECs and Platforms
   per sound card.
 * Added soc_bind_dai_link() to bind the component devices to the sound card.
 * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
   DAI link components.
 * sysfs entries can now be registered per component per card.
 * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
 * snd_soc_register_codec() now does all the codec list and mutex init.

This patch changes the probe() and remove() of the CODEC drivers as follows:-

 o Make CODEC driver a platform driver
 o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
 o Removed all static codec pointers (drivers now support > 1 codec dev)
 o snd_soc_register_pcms() now done by core.
 o snd_soc_register_dai() folded into snd_soc_register_codec().

CS4270 portions:
Acked-by: default avatarTimur Tabi <timur@freescale.com>

Some TLV320aic23 and Cirrus platform fixes.
Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>

TI CODEC and OMAP fixes
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>

Samsung platform and misc fixes :-
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarJassi Brar <jassi.brar@samsung.com>
Signed-off-by: default avatarSeungwhan Youn <sw.youn@samsung.com>

MPC8610 and PPC fixes.
Signed-off-by: default avatarTimur Tabi <timur@freescale.com>

i.MX fixes and some core fixes.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>

J4740 platform fixes:-
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>

CC: Tony Lindgren <tony@atomide.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
CC: Sascha Hauer <s.hauer@pengutronix.de>
CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
CC: Kuninori Morimoto <morimoto.kuninori@renesas.com>
CC: Daniel Gloeckner <dg@emlix.com>
CC: Manuel Lauss <mano@roarinelk.homelinux.net>
CC: Mike Frysinger <vapier.adi@gmail.com>
CC: Arnaud Patard <apatard@mandriva.com>
CC: Wan ZongShun <mcuos.com@gmail.com>

Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent bda7d2a8

arch/arm/mach-davinci/devices.c

+13 −0
Original line number Diff line number Diff line
@@ -295,6 +295,18 @@ static void davinci_init_wdt(void) 


/*-------------------------------------------------------------------------*/



struct platform_device davinci_pcm_device = {

	.name		= "davinci-pcm-audio",

	.id		= -1,

};



static void davinci_init_pcm(void)

{

	platform_device_register(&davinci_pcm_device);

}



/*-------------------------------------------------------------------------*/



struct davinci_timer_instance davinci_timer_instance[2] = {

	{

		.base		= DAVINCI_TIMER0_BASE,
@@ -315,6 +327,7 @@ static int __init davinci_init_devices(void) 
	/* please keep these calls, and their implementations above,

	 * in alphabetical order so they're easier to sort through.

	 */

	davinci_init_pcm();

	davinci_init_wdt();



	return 0;

arch/arm/mach-ep93xx/core.c

+6 −0
Original line number Diff line number Diff line
@@ -732,9 +732,15 @@ static struct platform_device ep93xx_i2s_device = { 
	.resource	= ep93xx_i2s_resource,

};



static struct platform_device ep93xx_pcm_device = {

	.name		= "ep93xx-pcm-audio",

	.id		= -1,

};



void __init ep93xx_register_i2s(void)

{

	platform_device_register(&ep93xx_i2s_device);

	platform_device_register(&ep93xx_pcm_device);

}



#define EP93XX_SYSCON_DEVCFG_I2S_MASK	(EP93XX_SYSCON_DEVCFG_I2SONSSP | \

arch/arm/mach-kirkwood/common.c

+6 −0
Original line number Diff line number Diff line
@@ -896,10 +896,16 @@ static struct platform_device kirkwood_i2s_device = { 
	},

};



static struct platform_device kirkwood_pcm_device = {

	.name		= "kirkwood-pcm",

	.id		= -1,

};



void __init kirkwood_audio_init(void)

{

	kirkwood_clk_ctrl |= CGC_AUDIO;

	platform_device_register(&kirkwood_i2s_device);

	platform_device_register(&kirkwood_pcm_device);

}



/*****************************************************************************

arch/arm/mach-mx2/clock_imx27.c

+2 −2
Original line number Diff line number Diff line
@@ -653,8 +653,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1)

	_REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk)

	_REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)

	_REGISTER_CLOCK(NULL, "vpu", vpu_clk)

	_REGISTER_CLOCK(NULL, "dma", dma_clk)

arch/arm/mach-mx2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ struct platform_device mxc_usbh2 = { 
	};								\

									\

	struct platform_device imx_ssi_device ## n = {			\

		.name = "imx-ssi",					\

		.name = "imx-ssi-dai",					\

		.id = n,						\

		.num_resources = ARRAY_SIZE(imx_ssi_resources ## n),	\

		.resource = imx_ssi_resources ## n,			\