mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +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>
338 lines
9.0 KiB
C
338 lines
9.0 KiB
C
/*
|
|
* omap3pandora.c -- SoC audio for Pandora Handheld Console
|
|
*
|
|
* Author: Gražvydas Ignotas <notasas@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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <plat/mcbsp.h>
|
|
|
|
#include "omap-mcbsp.h"
|
|
#include "omap-pcm.h"
|
|
|
|
#define OMAP3_PANDORA_DAC_POWER_GPIO 118
|
|
#define OMAP3_PANDORA_AMP_POWER_GPIO 14
|
|
|
|
#define PREFIX "ASoC omap3pandora: "
|
|
|
|
static struct regulator *omap3pandora_dac_reg;
|
|
|
|
static int omap3pandora_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
|
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
|
int fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBS_CFS;
|
|
int ret;
|
|
|
|
/* Set codec DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(codec_dai, fmt);
|
|
if (ret < 0) {
|
|
pr_err(PREFIX "can't set codec DAI configuration\n");
|
|
return ret;
|
|
}
|
|
|
|
/* Set cpu DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
|
|
if (ret < 0) {
|
|
pr_err(PREFIX "can't set cpu DAI configuration\n");
|
|
return ret;
|
|
}
|
|
|
|
/* Set the codec system clock for DAC and ADC */
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
|
|
SND_SOC_CLOCK_IN);
|
|
if (ret < 0) {
|
|
pr_err(PREFIX "can't set codec system clock\n");
|
|
return ret;
|
|
}
|
|
|
|
/* Set McBSP clock to external */
|
|
ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKS_EXT,
|
|
256 * params_rate(params),
|
|
SND_SOC_CLOCK_IN);
|
|
if (ret < 0) {
|
|
pr_err(PREFIX "can't set cpu system clock\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_dai_set_clkdiv(cpu_dai, OMAP_MCBSP_CLKGDV, 8);
|
|
if (ret < 0) {
|
|
pr_err(PREFIX "can't set SRG clock divider\n");
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
|
|
struct snd_kcontrol *k, int event)
|
|
{
|
|
/*
|
|
* The PCM1773 DAC datasheet requires 1ms delay between switching
|
|
* VCC power on/off and /PD pin high/low
|
|
*/
|
|
if (SND_SOC_DAPM_EVENT_ON(event)) {
|
|
regulator_enable(omap3pandora_dac_reg);
|
|
mdelay(1);
|
|
gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
|
|
} else {
|
|
gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 0);
|
|
mdelay(1);
|
|
regulator_disable(omap3pandora_dac_reg);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
|
|
struct snd_kcontrol *k, int event)
|
|
{
|
|
if (SND_SOC_DAPM_EVENT_ON(event))
|
|
gpio_set_value(OMAP3_PANDORA_AMP_POWER_GPIO, 1);
|
|
else
|
|
gpio_set_value(OMAP3_PANDORA_AMP_POWER_GPIO, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Audio paths on Pandora board:
|
|
*
|
|
* |O| ---> PCM DAC +-> AMP -> Headphone Jack
|
|
* |M| A +--------> Line Out
|
|
* |A| <~~clk~~+
|
|
* |P| <--- TWL4030 <--------- Line In and MICs
|
|
*/
|
|
static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
|
|
SND_SOC_DAPM_DAC_E("PCM DAC", "HiFi Playback", SND_SOC_NOPM,
|
|
0, 0, omap3pandora_dac_event,
|
|
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
|
|
SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM,
|
|
0, 0, NULL, 0, omap3pandora_hp_event,
|
|
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
|
|
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
|
SND_SOC_DAPM_LINE("Line Out", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = {
|
|
SND_SOC_DAPM_MIC("Mic (internal)", NULL),
|
|
SND_SOC_DAPM_MIC("Mic (external)", NULL),
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route omap3pandora_out_map[] = {
|
|
{"PCM DAC", NULL, "APLL Enable"},
|
|
{"Headphone Amplifier", NULL, "PCM DAC"},
|
|
{"Line Out", NULL, "PCM DAC"},
|
|
{"Headphone Jack", NULL, "Headphone Amplifier"},
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route omap3pandora_in_map[] = {
|
|
{"AUXL", NULL, "Line In"},
|
|
{"AUXR", NULL, "Line In"},
|
|
|
|
{"MAINMIC", NULL, "Mic Bias 1"},
|
|
{"Mic Bias 1", NULL, "Mic (internal)"},
|
|
|
|
{"SUBMIC", NULL, "Mic Bias 2"},
|
|
{"Mic Bias 2", NULL, "Mic (external)"},
|
|
};
|
|
|
|
static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
int ret;
|
|
|
|
/* All TWL4030 output pins are floating */
|
|
snd_soc_dapm_nc_pin(codec, "EARPIECE");
|
|
snd_soc_dapm_nc_pin(codec, "PREDRIVEL");
|
|
snd_soc_dapm_nc_pin(codec, "PREDRIVER");
|
|
snd_soc_dapm_nc_pin(codec, "HSOL");
|
|
snd_soc_dapm_nc_pin(codec, "HSOR");
|
|
snd_soc_dapm_nc_pin(codec, "CARKITL");
|
|
snd_soc_dapm_nc_pin(codec, "CARKITR");
|
|
snd_soc_dapm_nc_pin(codec, "HFL");
|
|
snd_soc_dapm_nc_pin(codec, "HFR");
|
|
snd_soc_dapm_nc_pin(codec, "VIBRA");
|
|
|
|
ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
|
|
ARRAY_SIZE(omap3pandora_out_dapm_widgets));
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
snd_soc_dapm_add_routes(codec, omap3pandora_out_map,
|
|
ARRAY_SIZE(omap3pandora_out_map));
|
|
|
|
return snd_soc_dapm_sync(codec);
|
|
}
|
|
|
|
static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
int ret;
|
|
|
|
/* Not comnnected */
|
|
snd_soc_dapm_nc_pin(codec, "HSMIC");
|
|
snd_soc_dapm_nc_pin(codec, "CARKITMIC");
|
|
snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
|
|
snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
|
|
|
|
ret = snd_soc_dapm_new_controls(codec, omap3pandora_in_dapm_widgets,
|
|
ARRAY_SIZE(omap3pandora_in_dapm_widgets));
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
snd_soc_dapm_add_routes(codec, omap3pandora_in_map,
|
|
ARRAY_SIZE(omap3pandora_in_map));
|
|
|
|
return snd_soc_dapm_sync(codec);
|
|
}
|
|
|
|
static struct snd_soc_ops omap3pandora_ops = {
|
|
.hw_params = omap3pandora_hw_params,
|
|
};
|
|
|
|
/* Digital audio interface glue - connects codec <--> CPU */
|
|
static struct snd_soc_dai_link omap3pandora_dai[] = {
|
|
{
|
|
.name = "PCM1773",
|
|
.stream_name = "HiFi Out",
|
|
.cpu_dai_name = "omap-mcbsp-dai.1",
|
|
.codec_dai_name = "twl4030-hifi",
|
|
.platform_name = "omap-pcm-audio",
|
|
.codec_name = "twl4030-codec",
|
|
.ops = &omap3pandora_ops,
|
|
.init = omap3pandora_out_init,
|
|
}, {
|
|
.name = "TWL4030",
|
|
.stream_name = "Line/Mic In",
|
|
.cpu_dai_name = "omap-mcbsp-dai.3",
|
|
.codec_dai_name = "twl4030-hifi",
|
|
.platform_name = "omap-pcm-audio",
|
|
.codec_name = "twl4030-codec",
|
|
.ops = &omap3pandora_ops,
|
|
.init = omap3pandora_in_init,
|
|
}
|
|
};
|
|
|
|
/* SoC card */
|
|
static struct snd_soc_card snd_soc_card_omap3pandora = {
|
|
.name = "omap3pandora",
|
|
.dai_link = omap3pandora_dai,
|
|
.num_links = ARRAY_SIZE(omap3pandora_dai),
|
|
};
|
|
|
|
static struct platform_device *omap3pandora_snd_device;
|
|
|
|
static int __init omap3pandora_soc_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!machine_is_omap3_pandora())
|
|
return -ENODEV;
|
|
|
|
pr_info("OMAP3 Pandora SoC init\n");
|
|
|
|
ret = gpio_request(OMAP3_PANDORA_DAC_POWER_GPIO, "dac_power");
|
|
if (ret) {
|
|
pr_err(PREFIX "Failed to get DAC power GPIO\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = gpio_direction_output(OMAP3_PANDORA_DAC_POWER_GPIO, 0);
|
|
if (ret) {
|
|
pr_err(PREFIX "Failed to set DAC power GPIO direction\n");
|
|
goto fail0;
|
|
}
|
|
|
|
ret = gpio_request(OMAP3_PANDORA_AMP_POWER_GPIO, "amp_power");
|
|
if (ret) {
|
|
pr_err(PREFIX "Failed to get amp power GPIO\n");
|
|
goto fail0;
|
|
}
|
|
|
|
ret = gpio_direction_output(OMAP3_PANDORA_AMP_POWER_GPIO, 0);
|
|
if (ret) {
|
|
pr_err(PREFIX "Failed to set amp power GPIO direction\n");
|
|
goto fail1;
|
|
}
|
|
|
|
omap3pandora_snd_device = platform_device_alloc("soc-audio", -1);
|
|
if (omap3pandora_snd_device == NULL) {
|
|
pr_err(PREFIX "Platform device allocation failed\n");
|
|
ret = -ENOMEM;
|
|
goto fail1;
|
|
}
|
|
|
|
platform_set_drvdata(omap3pandora_snd_device, &snd_soc_card_omap3pandora);
|
|
|
|
ret = platform_device_add(omap3pandora_snd_device);
|
|
if (ret) {
|
|
pr_err(PREFIX "Unable to add platform device\n");
|
|
goto fail2;
|
|
}
|
|
|
|
omap3pandora_dac_reg = regulator_get(&omap3pandora_snd_device->dev, "vcc");
|
|
if (IS_ERR(omap3pandora_dac_reg)) {
|
|
pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n",
|
|
dev_name(&omap3pandora_snd_device->dev),
|
|
PTR_ERR(omap3pandora_dac_reg));
|
|
goto fail3;
|
|
}
|
|
|
|
return 0;
|
|
|
|
fail3:
|
|
platform_device_del(omap3pandora_snd_device);
|
|
fail2:
|
|
platform_device_put(omap3pandora_snd_device);
|
|
fail1:
|
|
gpio_free(OMAP3_PANDORA_AMP_POWER_GPIO);
|
|
fail0:
|
|
gpio_free(OMAP3_PANDORA_DAC_POWER_GPIO);
|
|
return ret;
|
|
}
|
|
module_init(omap3pandora_soc_init);
|
|
|
|
static void __exit omap3pandora_soc_exit(void)
|
|
{
|
|
regulator_put(omap3pandora_dac_reg);
|
|
platform_device_unregister(omap3pandora_snd_device);
|
|
gpio_free(OMAP3_PANDORA_AMP_POWER_GPIO);
|
|
gpio_free(OMAP3_PANDORA_DAC_POWER_GPIO);
|
|
}
|
|
module_exit(omap3pandora_soc_exit);
|
|
|
|
MODULE_AUTHOR("Grazvydas Ignotas <notasas@gmail.com>");
|
|
MODULE_DESCRIPTION("ALSA SoC OMAP3 Pandora");
|
|
MODULE_LICENSE("GPL");
|