mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +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>
188 lines
4.4 KiB
C
188 lines
4.4 KiB
C
/*
|
|
* ALSA Soc PCM3008 codec support
|
|
*
|
|
* Author: Hugo Villeneuve
|
|
* Copyright (C) 2008 Lyrtech inc
|
|
*
|
|
* Based on AC97 Soc codec, original copyright follow:
|
|
* Copyright 2005 Wolfson Microelectronics PLC.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* Generic PCM3008 support.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/slab.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/initval.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "pcm3008.h"
|
|
|
|
#define PCM3008_VERSION "0.2"
|
|
|
|
#define PCM3008_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
|
|
SNDRV_PCM_RATE_48000)
|
|
|
|
static struct snd_soc_dai_driver pcm3008_dai = {
|
|
.name = "pcm3008-hifi",
|
|
.playback = {
|
|
.stream_name = "PCM3008 Playback",
|
|
.channels_min = 1,
|
|
.channels_max = 2,
|
|
.rates = PCM3008_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
},
|
|
.capture = {
|
|
.stream_name = "PCM3008 Capture",
|
|
.channels_min = 1,
|
|
.channels_max = 2,
|
|
.rates = PCM3008_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
|
},
|
|
};
|
|
|
|
static void pcm3008_gpio_free(struct pcm3008_setup_data *setup)
|
|
{
|
|
gpio_free(setup->dem0_pin);
|
|
gpio_free(setup->dem1_pin);
|
|
gpio_free(setup->pdad_pin);
|
|
gpio_free(setup->pdda_pin);
|
|
}
|
|
|
|
static int pcm3008_soc_probe(struct snd_soc_codec *codec)
|
|
{
|
|
struct pcm3008_setup_data *setup = codec->dev->platform_data;
|
|
int ret = 0;
|
|
|
|
printk(KERN_INFO "PCM3008 SoC Audio Codec %s\n", PCM3008_VERSION);
|
|
|
|
/* DEM1 DEM0 DE-EMPHASIS_MODE
|
|
* Low Low De-emphasis 44.1 kHz ON
|
|
* Low High De-emphasis OFF
|
|
* High Low De-emphasis 48 kHz ON
|
|
* High High De-emphasis 32 kHz ON
|
|
*/
|
|
|
|
/* Configure DEM0 GPIO (turning OFF DAC De-emphasis). */
|
|
ret = gpio_request(setup->dem0_pin, "codec_dem0");
|
|
if (ret == 0)
|
|
ret = gpio_direction_output(setup->dem0_pin, 1);
|
|
if (ret != 0)
|
|
goto gpio_err;
|
|
|
|
/* Configure DEM1 GPIO (turning OFF DAC De-emphasis). */
|
|
ret = gpio_request(setup->dem1_pin, "codec_dem1");
|
|
if (ret == 0)
|
|
ret = gpio_direction_output(setup->dem1_pin, 0);
|
|
if (ret != 0)
|
|
goto gpio_err;
|
|
|
|
/* Configure PDAD GPIO. */
|
|
ret = gpio_request(setup->pdad_pin, "codec_pdad");
|
|
if (ret == 0)
|
|
ret = gpio_direction_output(setup->pdad_pin, 1);
|
|
if (ret != 0)
|
|
goto gpio_err;
|
|
|
|
/* Configure PDDA GPIO. */
|
|
ret = gpio_request(setup->pdda_pin, "codec_pdda");
|
|
if (ret == 0)
|
|
ret = gpio_direction_output(setup->pdda_pin, 1);
|
|
if (ret != 0)
|
|
goto gpio_err;
|
|
|
|
return ret;
|
|
|
|
gpio_err:
|
|
pcm3008_gpio_free(setup);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int pcm3008_soc_remove(struct snd_soc_codec *codec)
|
|
{
|
|
struct pcm3008_setup_data *setup = codec->dev->platform_data;
|
|
|
|
pcm3008_gpio_free(setup);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
static int pcm3008_soc_suspend(struct snd_soc_codec *codec, pm_message_t msg)
|
|
{
|
|
struct pcm3008_setup_data *setup = codec->dev->platform_data;
|
|
|
|
gpio_set_value(setup->pdad_pin, 0);
|
|
gpio_set_value(setup->pdda_pin, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int pcm3008_soc_resume(struct snd_soc_codec *codec)
|
|
{
|
|
struct pcm3008_setup_data *setup = codec->dev->platform_data;
|
|
|
|
gpio_set_value(setup->pdad_pin, 1);
|
|
gpio_set_value(setup->pdda_pin, 1);
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
#define pcm3008_soc_suspend NULL
|
|
#define pcm3008_soc_resume NULL
|
|
#endif
|
|
|
|
static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {
|
|
.probe = pcm3008_soc_probe,
|
|
.remove = pcm3008_soc_remove,
|
|
.suspend = pcm3008_soc_suspend,
|
|
.resume = pcm3008_soc_resume,
|
|
};
|
|
|
|
static int __devinit pcm3008_codec_probe(struct platform_device *pdev)
|
|
{
|
|
return snd_soc_register_codec(&pdev->dev,
|
|
&soc_codec_dev_pcm3008, &pcm3008_dai, 1);
|
|
}
|
|
|
|
static int __devexit pcm3008_codec_remove(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_codec(&pdev->dev);
|
|
return 0;
|
|
}
|
|
|
|
MODULE_ALIAS("platform:pcm3008-codec");
|
|
|
|
static struct platform_driver pcm3008_codec_driver = {
|
|
.probe = pcm3008_codec_probe,
|
|
.remove = __devexit_p(pcm3008_codec_remove),
|
|
.driver = {
|
|
.name = "pcm3008-codec",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __init pcm3008_modinit(void)
|
|
{
|
|
return platform_driver_register(&pcm3008_codec_driver);
|
|
}
|
|
module_init(pcm3008_modinit);
|
|
|
|
static void __exit pcm3008_exit(void)
|
|
{
|
|
platform_driver_unregister(&pcm3008_codec_driver);
|
|
}
|
|
module_exit(pcm3008_exit);
|
|
|
|
MODULE_DESCRIPTION("Soc PCM3008 driver");
|
|
MODULE_AUTHOR("Hugo Villeneuve");
|
|
MODULE_LICENSE("GPL");
|