mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 12:11:59 +00:00
f0fba2ad1b
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: Timur Tabi <timur@freescale.com> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <timur@freescale.com> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> J4740 platform fixes:- Signed-off-by: Lars-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: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
225 lines
5.3 KiB
C
225 lines
5.3 KiB
C
/*
|
|
* linux/sound/soc/pxa/palm27x.c
|
|
*
|
|
* SoC Audio driver for Palm T|X, T5 and LifeDrive
|
|
*
|
|
* based on tosa.c
|
|
*
|
|
* Copyright (C) 2008 Marek Vasut <marek.vasut@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/device.h>
|
|
#include <linux/gpio.h>
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include <sound/jack.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <mach/audio.h>
|
|
#include <mach/palmasoc.h>
|
|
|
|
#include "../codecs/wm9712.h"
|
|
#include "pxa2xx-ac97.h"
|
|
|
|
static struct snd_soc_jack hs_jack;
|
|
|
|
/* Headphones jack detection DAPM pins */
|
|
static struct snd_soc_jack_pin hs_jack_pins[] = {
|
|
{
|
|
.pin = "Headphone Jack",
|
|
.mask = SND_JACK_HEADPHONE,
|
|
},
|
|
};
|
|
|
|
/* Headphones jack detection gpios */
|
|
static struct snd_soc_jack_gpio hs_jack_gpios[] = {
|
|
[0] = {
|
|
/* gpio is set on per-platform basis */
|
|
.name = "hp-gpio",
|
|
.report = SND_JACK_HEADPHONE,
|
|
.debounce_time = 200,
|
|
},
|
|
};
|
|
|
|
/* Palm27x machine dapm widgets */
|
|
static const struct snd_soc_dapm_widget palm27x_dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
|
SND_SOC_DAPM_SPK("Ext. Speaker", NULL),
|
|
SND_SOC_DAPM_MIC("Ext. Microphone", NULL),
|
|
};
|
|
|
|
/* PalmTX audio map */
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
|
/* headphone connected to HPOUTL, HPOUTR */
|
|
{"Headphone Jack", NULL, "HPOUTL"},
|
|
{"Headphone Jack", NULL, "HPOUTR"},
|
|
|
|
/* ext speaker connected to ROUT2, LOUT2 */
|
|
{"Ext. Speaker", NULL, "LOUT2"},
|
|
{"Ext. Speaker", NULL, "ROUT2"},
|
|
|
|
/* mic connected to MIC1 */
|
|
{"Ext. Microphone", NULL, "MIC1"},
|
|
};
|
|
|
|
static struct snd_soc_card palm27x_asoc;
|
|
|
|
static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
int err;
|
|
|
|
/* add palm27x specific widgets */
|
|
err = snd_soc_dapm_new_controls(codec, palm27x_dapm_widgets,
|
|
ARRAY_SIZE(palm27x_dapm_widgets));
|
|
if (err)
|
|
return err;
|
|
|
|
/* set up palm27x specific audio path audio_map */
|
|
err = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
|
|
if (err)
|
|
return err;
|
|
|
|
/* connected pins */
|
|
if (machine_is_palmld())
|
|
snd_soc_dapm_enable_pin(codec, "MIC1");
|
|
snd_soc_dapm_enable_pin(codec, "HPOUTL");
|
|
snd_soc_dapm_enable_pin(codec, "HPOUTR");
|
|
snd_soc_dapm_enable_pin(codec, "LOUT2");
|
|
snd_soc_dapm_enable_pin(codec, "ROUT2");
|
|
|
|
/* not connected pins */
|
|
snd_soc_dapm_nc_pin(codec, "OUT3");
|
|
snd_soc_dapm_nc_pin(codec, "MONOOUT");
|
|
snd_soc_dapm_nc_pin(codec, "LINEINL");
|
|
snd_soc_dapm_nc_pin(codec, "LINEINR");
|
|
snd_soc_dapm_nc_pin(codec, "PCBEEP");
|
|
snd_soc_dapm_nc_pin(codec, "PHONE");
|
|
snd_soc_dapm_nc_pin(codec, "MIC2");
|
|
|
|
err = snd_soc_dapm_sync(codec);
|
|
if (err)
|
|
return err;
|
|
|
|
/* Jack detection API stuff */
|
|
err = snd_soc_jack_new(codec, "Headphone Jack",
|
|
SND_JACK_HEADPHONE, &hs_jack);
|
|
if (err)
|
|
return err;
|
|
|
|
err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
|
|
hs_jack_pins);
|
|
if (err)
|
|
return err;
|
|
|
|
err = snd_soc_jack_add_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios),
|
|
hs_jack_gpios);
|
|
|
|
return err;
|
|
}
|
|
|
|
static struct snd_soc_dai_link palm27x_dai[] = {
|
|
{
|
|
.name = "AC97 HiFi",
|
|
.stream_name = "AC97 HiFi",
|
|
.cpu_dai_name = "pxa-ac97.0",
|
|
.codec_dai_name = "wm9712-hifi",
|
|
.codec_name = "wm9712-codec",
|
|
.platform_name = "pxa-pcm-audio",
|
|
.init = palm27x_ac97_init,
|
|
},
|
|
{
|
|
.name = "AC97 Aux",
|
|
.stream_name = "AC97 Aux",
|
|
.cpu_dai_name = "pxa-ac97.1",
|
|
.codec_dai_name = "wm9712-aux",
|
|
.codec_name = "wm9712-codec",
|
|
.platform_name = "pxa-pcm-audio",
|
|
},
|
|
};
|
|
|
|
static struct snd_soc_card palm27x_asoc = {
|
|
.name = "Palm/PXA27x",
|
|
.dai_link = palm27x_dai,
|
|
.num_links = ARRAY_SIZE(palm27x_dai),
|
|
};
|
|
|
|
static struct platform_device *palm27x_snd_device;
|
|
|
|
static int palm27x_asoc_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
|
|
if (!(machine_is_palmtx() || machine_is_palmt5() ||
|
|
machine_is_palmld() || machine_is_palmte2()))
|
|
return -ENODEV;
|
|
|
|
if (!pdev->dev.platform_data) {
|
|
dev_err(&pdev->dev, "please supply platform_data\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
hs_jack_gpios[0].gpio = ((struct palm27x_asoc_info *)
|
|
(pdev->dev.platform_data))->jack_gpio;
|
|
|
|
palm27x_snd_device = platform_device_alloc("soc-audio", -1);
|
|
if (!palm27x_snd_device)
|
|
return -ENOMEM;
|
|
|
|
platform_set_drvdata(palm27x_snd_device, &palm27x_asoc);
|
|
ret = platform_device_add(palm27x_snd_device);
|
|
|
|
if (ret != 0)
|
|
goto put_device;
|
|
|
|
return 0;
|
|
|
|
put_device:
|
|
platform_device_put(palm27x_snd_device);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int __devexit palm27x_asoc_remove(struct platform_device *pdev)
|
|
{
|
|
platform_device_unregister(palm27x_snd_device);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver palm27x_wm9712_driver = {
|
|
.probe = palm27x_asoc_probe,
|
|
.remove = __devexit_p(palm27x_asoc_remove),
|
|
.driver = {
|
|
.name = "palm27x-asoc",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __init palm27x_asoc_init(void)
|
|
{
|
|
return platform_driver_register(&palm27x_wm9712_driver);
|
|
}
|
|
|
|
static void __exit palm27x_asoc_exit(void)
|
|
{
|
|
platform_driver_unregister(&palm27x_wm9712_driver);
|
|
}
|
|
|
|
module_init(palm27x_asoc_init);
|
|
module_exit(palm27x_asoc_exit);
|
|
|
|
/* Module information */
|
|
MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
|
|
MODULE_DESCRIPTION("ALSA SoC Palm T|X, T5 and LifeDrive");
|
|
MODULE_LICENSE("GPL");
|