mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 02:52:56 +00:00
f5a246eab9
This contains pretty many small commits covering fairly large range of files in sound/ directory. Partly because of additional API support and partly because of constantly developed ASoC and ARM stuff. Some highlights: - Introduced the helper function and documentation for exposing the channel map via control API, as discussed in Plumbers; most of PCI drivers are covered, will follow more drivers later - Most of drivers have been replaced with the new PM callbacks (if the bus is supported) - HD-audio controller got the support of runtime PM and the support of D3 clock-stop. Also changing the power_save option in sysfs kicks off immediately to enable / disable the power-save mode. - Another significant code change in HD-audio is the rewrite of firmware loading code. Other than that, most of changes in HD-audio are continued cleanups and standardization for the generic auto parser and bug fixes (HBR, device-specific fixups), in addition to the support of channel-map API. - Addition of ASoC bindings for the compressed API, used by the mid-x86 drivers. - Lots of cleanups and API refreshes for ASoC codec drivers and DaVinci. - Conversion of OMAP to dmaengine. - New machine driver for Wolfson Microelectronics Bells. - New CODEC driver for Wolfson Microelectronics WM0010. - Enhancements to the ux500 and wm2000 drivers - A new driver for DA9055 and the support for regulator bypass mode. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJQcpeWAAoJEGwxgFQ9KSmkpi4P/2etDDz5aEkEHNa1l4xEmFcm ymiGTgjaalqpUAVbM/gYx9G59EFMEbzUl1BHAqE5La4wO/v9lNPb+VrdUo+B+NZ7 WSxIPWcNqdinSuoSqyYPjoPMVnhs3EMtNOqmf4jm1JOvdqA+4rO29xQVAqK/5Gfu LpMOyPiRi5ODnbQ1BOIWwpKICioY/mLwGJudK3z0i/fYVA7gLub20f+w+sOjKIA4 wmwQAMTjAR798Cg/tVy4fQmf4SLw+c2nIgGe/PD+2gVlGXLNKBrJfMonHPTbmwKu lmJO/EtnijNOnpbn6up7ryUQ9cSoZAUZOfdIOgmAeQgQ/LWR0f+zf2IQehSPwrul g6hqOnQI2DNN7ugT3cYVbYnsh56TjyhnxhhxZgkapqh706QkqHGyKJNMRetzuXmP 1O//MnZJrFQWd6sOKLlTL2ZzRvnxEJcNVGaE6bbwZTfQMtPeo9l1842uIq1dLUtG VxZb/svKUkMXv4is1dwUYUkpDsKxsgMEmabmuovceGf2N7jj/irkXgqxf6LWkaY1 JQ7ZFWUJyDzEMXRaFfzdGO15T532CfB84wvFX5xoPMwMste2AA7QuybFBVstXhKu AtKNDgRJFUTlnLIxydpPBWdWH3UJdEaFwwsSfuNKI8OmmGKhWC/aP83k4hzueu9H KYLvY/0ObMSMqiwh/ndQ =uNqD -----END PGP SIGNATURE----- Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound updates from Takashi Iwai: "This contains pretty many small commits covering fairly large range of files in sound/ directory. Partly because of additional API support and partly because of constantly developed ASoC and ARM stuff. Some highlights: - Introduced the helper function and documentation for exposing the channel map via control API, as discussed in Plumbers; most of PCI drivers are covered, will follow more drivers later - Most of drivers have been replaced with the new PM callbacks (if the bus is supported) - HD-audio controller got the support of runtime PM and the support of D3 clock-stop. Also changing the power_save option in sysfs kicks off immediately to enable / disable the power-save mode. - Another significant code change in HD-audio is the rewrite of firmware loading code. Other than that, most of changes in HD-audio are continued cleanups and standardization for the generic auto parser and bug fixes (HBR, device-specific fixups), in addition to the support of channel-map API. - Addition of ASoC bindings for the compressed API, used by the mid-x86 drivers. - Lots of cleanups and API refreshes for ASoC codec drivers and DaVinci. - Conversion of OMAP to dmaengine. - New machine driver for Wolfson Microelectronics Bells. - New CODEC driver for Wolfson Microelectronics WM0010. - Enhancements to the ux500 and wm2000 drivers - A new driver for DA9055 and the support for regulator bypass mode." Fix up various arm soc header file reorg conflicts. * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits) ALSA: hda - Add new codec ALC283 ALC290 support ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls ALSA: hda - fix indices on boost volume on Conexant ALSA: aloop - add locking to timer access ALSA: hda - Fix hang caused by race during suspend. sound: Remove unnecessary semicolon ALSA: hda/realtek - Fix detection of ALC271X codec ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310 ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event ALSA: hda - make a generic unsol event handler ASoC: codecs: Add DA9055 codec driver ASoC: eukrea-tlv320: Convert it to platform driver ALSA: ASoC: add DT bindings for CS4271 ASoC: wm_hubs: Ensure volume updates are handled during class W startup ASoC: wm5110: Adding missing volume update bits ASoC: wm5110: Add OUT3R support ASoC: wm5110: Add AEC loopback support ASoC: wm5110: Rename EPOUT to HPOUT3 ASoC: arizona: Add more clock rates ASoC: arizona: Add more DSP options for mixer input muxes ...
145 lines
3.7 KiB
C
145 lines
3.7 KiB
C
/*
|
|
* am3517evm.c -- ALSA SoC support for OMAP3517 / AM3517 EVM
|
|
*
|
|
* Author: Anuj Aggarwal <anuj.aggarwal@ti.com>
|
|
*
|
|
* Based on sound/soc/omap/beagle.c by Steve Sakoman
|
|
*
|
|
* Copyright (C) 2009 Texas Instruments Incorporated
|
|
*
|
|
* 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 version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
|
|
* whether express or implied; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/module.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/gpio.h>
|
|
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
|
|
|
#include "omap-mcbsp.h"
|
|
#include "omap-pcm.h"
|
|
|
|
#include "../codecs/tlv320aic23.h"
|
|
|
|
#define CODEC_CLOCK 12000000
|
|
|
|
static int am3517evm_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;
|
|
int ret;
|
|
|
|
/* Set the codec system clock for DAC and ADC */
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0,
|
|
CODEC_CLOCK, SND_SOC_CLOCK_IN);
|
|
if (ret < 0)
|
|
printk(KERN_ERR "can't set codec system clock\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct snd_soc_ops am3517evm_ops = {
|
|
.hw_params = am3517evm_hw_params,
|
|
};
|
|
|
|
/* am3517evm machine dapm widgets */
|
|
static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = {
|
|
SND_SOC_DAPM_HP("Line Out", NULL),
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
SND_SOC_DAPM_MIC("Mic In", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
|
/* Line Out connected to LLOUT, RLOUT */
|
|
{"Line Out", NULL, "LOUT"},
|
|
{"Line Out", NULL, "ROUT"},
|
|
|
|
{"LLINEIN", NULL, "Line In"},
|
|
{"RLINEIN", NULL, "Line In"},
|
|
|
|
{"MICIN", NULL, "Mic In"},
|
|
};
|
|
|
|
/* Digital audio interface glue - connects codec <--> CPU */
|
|
static struct snd_soc_dai_link am3517evm_dai = {
|
|
.name = "TLV320AIC23",
|
|
.stream_name = "AIC23",
|
|
.cpu_dai_name = "omap-mcbsp.1",
|
|
.codec_dai_name = "tlv320aic23-hifi",
|
|
.platform_name = "omap-pcm-audio",
|
|
.codec_name = "tlv320aic23-codec.2-001a",
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM,
|
|
.ops = &am3517evm_ops,
|
|
};
|
|
|
|
/* Audio machine driver */
|
|
static struct snd_soc_card snd_soc_am3517evm = {
|
|
.name = "am3517evm",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = &am3517evm_dai,
|
|
.num_links = 1,
|
|
|
|
.dapm_widgets = tlv320aic23_dapm_widgets,
|
|
.num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
|
|
.dapm_routes = audio_map,
|
|
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
|
};
|
|
|
|
static struct platform_device *am3517evm_snd_device;
|
|
|
|
static int __init am3517evm_soc_init(void)
|
|
{
|
|
int ret;
|
|
|
|
if (!machine_is_omap3517evm())
|
|
return -ENODEV;
|
|
pr_info("OMAP3517 / AM3517 EVM SoC init\n");
|
|
|
|
am3517evm_snd_device = platform_device_alloc("soc-audio", -1);
|
|
if (!am3517evm_snd_device) {
|
|
printk(KERN_ERR "Platform device allocation failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
platform_set_drvdata(am3517evm_snd_device, &snd_soc_am3517evm);
|
|
|
|
ret = platform_device_add(am3517evm_snd_device);
|
|
if (ret)
|
|
goto err1;
|
|
|
|
return 0;
|
|
|
|
err1:
|
|
printk(KERN_ERR "Unable to add platform device\n");
|
|
platform_device_put(am3517evm_snd_device);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __exit am3517evm_soc_exit(void)
|
|
{
|
|
platform_device_unregister(am3517evm_snd_device);
|
|
}
|
|
|
|
module_init(am3517evm_soc_init);
|
|
module_exit(am3517evm_soc_exit);
|
|
|
|
MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>");
|
|
MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM");
|
|
MODULE_LICENSE("GPL v2");
|