mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 13:51:44 +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>
321 lines
7.7 KiB
C
321 lines
7.7 KiB
C
/*
|
|
* soc-jack.c -- ALSA SoC jack handling
|
|
*
|
|
* Copyright 2008 Wolfson Microelectronics PLC.
|
|
*
|
|
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <sound/jack.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/delay.h>
|
|
|
|
/**
|
|
* snd_soc_jack_new - Create a new jack
|
|
* @card: ASoC card
|
|
* @id: an identifying string for this jack
|
|
* @type: a bitmask of enum snd_jack_type values that can be detected by
|
|
* this jack
|
|
* @jack: structure to use for the jack
|
|
*
|
|
* Creates a new jack object.
|
|
*
|
|
* Returns zero if successful, or a negative error code on failure.
|
|
* On success jack will be initialised.
|
|
*/
|
|
int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
|
|
struct snd_soc_jack *jack)
|
|
{
|
|
jack->codec = codec;
|
|
INIT_LIST_HEAD(&jack->pins);
|
|
BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);
|
|
|
|
return snd_jack_new(codec->card->snd_card, id, type, &jack->jack);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_new);
|
|
|
|
/**
|
|
* snd_soc_jack_report - Report the current status for a jack
|
|
*
|
|
* @jack: the jack
|
|
* @status: a bitmask of enum snd_jack_type values that are currently detected.
|
|
* @mask: a bitmask of enum snd_jack_type values that being reported.
|
|
*
|
|
* If configured using snd_soc_jack_add_pins() then the associated
|
|
* DAPM pins will be enabled or disabled as appropriate and DAPM
|
|
* synchronised.
|
|
*
|
|
* Note: This function uses mutexes and should be called from a
|
|
* context which can sleep (such as a workqueue).
|
|
*/
|
|
void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
|
|
{
|
|
struct snd_soc_codec *codec;
|
|
struct snd_soc_jack_pin *pin;
|
|
int enable;
|
|
int oldstatus;
|
|
|
|
if (!jack)
|
|
return;
|
|
|
|
codec = jack->codec;
|
|
|
|
mutex_lock(&codec->mutex);
|
|
|
|
oldstatus = jack->status;
|
|
|
|
jack->status &= ~mask;
|
|
jack->status |= status & mask;
|
|
|
|
/* The DAPM sync is expensive enough to be worth skipping.
|
|
* However, empty mask means pin synchronization is desired. */
|
|
if (mask && (jack->status == oldstatus))
|
|
goto out;
|
|
|
|
list_for_each_entry(pin, &jack->pins, list) {
|
|
enable = pin->mask & jack->status;
|
|
|
|
if (pin->invert)
|
|
enable = !enable;
|
|
|
|
if (enable)
|
|
snd_soc_dapm_enable_pin(codec, pin->pin);
|
|
else
|
|
snd_soc_dapm_disable_pin(codec, pin->pin);
|
|
}
|
|
|
|
/* Report before the DAPM sync to help users updating micbias status */
|
|
blocking_notifier_call_chain(&jack->notifier, status, NULL);
|
|
|
|
snd_soc_dapm_sync(codec);
|
|
|
|
snd_jack_report(jack->jack, status);
|
|
|
|
out:
|
|
mutex_unlock(&codec->mutex);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_report);
|
|
|
|
/**
|
|
* snd_soc_jack_add_pins - Associate DAPM pins with an ASoC jack
|
|
*
|
|
* @jack: ASoC jack
|
|
* @count: Number of pins
|
|
* @pins: Array of pins
|
|
*
|
|
* After this function has been called the DAPM pins specified in the
|
|
* pins array will have their status updated to reflect the current
|
|
* state of the jack whenever the jack status is updated.
|
|
*/
|
|
int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
|
|
struct snd_soc_jack_pin *pins)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
if (!pins[i].pin) {
|
|
printk(KERN_ERR "No name for pin %d\n", i);
|
|
return -EINVAL;
|
|
}
|
|
if (!pins[i].mask) {
|
|
printk(KERN_ERR "No mask for pin %d (%s)\n", i,
|
|
pins[i].pin);
|
|
return -EINVAL;
|
|
}
|
|
|
|
INIT_LIST_HEAD(&pins[i].list);
|
|
list_add(&(pins[i].list), &jack->pins);
|
|
}
|
|
|
|
/* Update to reflect the last reported status; canned jack
|
|
* implementations are likely to set their state before the
|
|
* card has an opportunity to associate pins.
|
|
*/
|
|
snd_soc_jack_report(jack, 0, 0);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_add_pins);
|
|
|
|
/**
|
|
* snd_soc_jack_notifier_register - Register a notifier for jack status
|
|
*
|
|
* @jack: ASoC jack
|
|
* @nb: Notifier block to register
|
|
*
|
|
* Register for notification of the current status of the jack. Note
|
|
* that it is not possible to report additional jack events in the
|
|
* callback from the notifier, this is intended to support
|
|
* applications such as enabling electrical detection only when a
|
|
* mechanical detection event has occurred.
|
|
*/
|
|
void snd_soc_jack_notifier_register(struct snd_soc_jack *jack,
|
|
struct notifier_block *nb)
|
|
{
|
|
blocking_notifier_chain_register(&jack->notifier, nb);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_notifier_register);
|
|
|
|
/**
|
|
* snd_soc_jack_notifier_unregister - Unregister a notifier for jack status
|
|
*
|
|
* @jack: ASoC jack
|
|
* @nb: Notifier block to unregister
|
|
*
|
|
* Stop notifying for status changes.
|
|
*/
|
|
void snd_soc_jack_notifier_unregister(struct snd_soc_jack *jack,
|
|
struct notifier_block *nb)
|
|
{
|
|
blocking_notifier_chain_unregister(&jack->notifier, nb);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_notifier_unregister);
|
|
|
|
#ifdef CONFIG_GPIOLIB
|
|
/* gpio detect */
|
|
static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
|
|
{
|
|
struct snd_soc_jack *jack = gpio->jack;
|
|
int enable;
|
|
int report;
|
|
|
|
if (gpio->debounce_time > 0)
|
|
mdelay(gpio->debounce_time);
|
|
|
|
enable = gpio_get_value(gpio->gpio);
|
|
if (gpio->invert)
|
|
enable = !enable;
|
|
|
|
if (enable)
|
|
report = gpio->report;
|
|
else
|
|
report = 0;
|
|
|
|
if (gpio->jack_status_check)
|
|
report = gpio->jack_status_check();
|
|
|
|
snd_soc_jack_report(jack, report, gpio->report);
|
|
}
|
|
|
|
/* irq handler for gpio pin */
|
|
static irqreturn_t gpio_handler(int irq, void *data)
|
|
{
|
|
struct snd_soc_jack_gpio *gpio = data;
|
|
|
|
schedule_work(&gpio->work);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
/* gpio work */
|
|
static void gpio_work(struct work_struct *work)
|
|
{
|
|
struct snd_soc_jack_gpio *gpio;
|
|
|
|
gpio = container_of(work, struct snd_soc_jack_gpio, work);
|
|
snd_soc_jack_gpio_detect(gpio);
|
|
}
|
|
|
|
/**
|
|
* snd_soc_jack_add_gpios - Associate GPIO pins with an ASoC jack
|
|
*
|
|
* @jack: ASoC jack
|
|
* @count: number of pins
|
|
* @gpios: array of gpio pins
|
|
*
|
|
* This function will request gpio, set data direction and request irq
|
|
* for each gpio in the array.
|
|
*/
|
|
int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
|
|
struct snd_soc_jack_gpio *gpios)
|
|
{
|
|
int i, ret;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
if (!gpio_is_valid(gpios[i].gpio)) {
|
|
printk(KERN_ERR "Invalid gpio %d\n",
|
|
gpios[i].gpio);
|
|
ret = -EINVAL;
|
|
goto undo;
|
|
}
|
|
if (!gpios[i].name) {
|
|
printk(KERN_ERR "No name for gpio %d\n",
|
|
gpios[i].gpio);
|
|
ret = -EINVAL;
|
|
goto undo;
|
|
}
|
|
|
|
ret = gpio_request(gpios[i].gpio, gpios[i].name);
|
|
if (ret)
|
|
goto undo;
|
|
|
|
ret = gpio_direction_input(gpios[i].gpio);
|
|
if (ret)
|
|
goto err;
|
|
|
|
INIT_WORK(&gpios[i].work, gpio_work);
|
|
gpios[i].jack = jack;
|
|
|
|
ret = request_irq(gpio_to_irq(gpios[i].gpio),
|
|
gpio_handler,
|
|
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
|
|
jack->codec->dev->driver->name,
|
|
&gpios[i]);
|
|
if (ret)
|
|
goto err;
|
|
|
|
#ifdef CONFIG_GPIO_SYSFS
|
|
/* Expose GPIO value over sysfs for diagnostic purposes */
|
|
gpio_export(gpios[i].gpio, false);
|
|
#endif
|
|
|
|
/* Update initial jack status */
|
|
snd_soc_jack_gpio_detect(&gpios[i]);
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
gpio_free(gpios[i].gpio);
|
|
undo:
|
|
snd_soc_jack_free_gpios(jack, i, gpios);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_add_gpios);
|
|
|
|
/**
|
|
* snd_soc_jack_free_gpios - Release GPIO pins' resources of an ASoC jack
|
|
*
|
|
* @jack: ASoC jack
|
|
* @count: number of pins
|
|
* @gpios: array of gpio pins
|
|
*
|
|
* Release gpio and irq resources for gpio pins associated with an ASoC jack.
|
|
*/
|
|
void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
|
|
struct snd_soc_jack_gpio *gpios)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
#ifdef CONFIG_GPIO_SYSFS
|
|
gpio_unexport(gpios[i].gpio);
|
|
#endif
|
|
free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]);
|
|
gpio_free(gpios[i].gpio);
|
|
gpios[i].jack = NULL;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_jack_free_gpios);
|
|
#endif /* CONFIG_GPIOLIB */
|