January 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/3] M-Audio C400 corrections
by Eldad Zack 14 Jan '13

14 Jan '13

Hi Takashi, The following are specific fixes for the M-Audio FT C400. * Use the clock selector instead of the internal clock and add names for the clocks instead of Unit 129 and Unit 130. * Fix an issue where the latency would change every time the stream is started. Uses skip_packets. I think they could go in current mainline, since it is only for this device, but I also checked that they apply cleanly against for-next. Cheers, Eldad Eldad Zack (3): ALSA: usb-audio: correct M-Audio C400 clock source quirk ALSA: usb-audio: M-Audio FT C400 skip packet quirk ALSA: usb-audio: selector map for M-Audio FT C400 sound/usb/mixer_maps.c | 13 +++++++++++++ sound/usb/quirks-table.h | 4 ++-- sound/usb/quirks.c | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) -- 1.7.12.4

2 4

Re: [alsa-devel] [RFC PATCH 4/4] alsa/soc: add hdmi audio codec based on cdf
by Sachin Kamat 14 Jan '13

14 Jan '13

+CC: ALSA mailing list, Mark Brown On 13 January 2013 18:22, Rahul Sharma <rahul.sharma(a)samsung.com> wrote: > This patch registers hdmi-audio codec to the ALSA framework. This is the second > client to the hdmi panel. Once notified by the CDF Core it proceeds towards > audio setting and audio control. It also subscribes for hpd notification to > implement hpd related audio requirements. > > Signed-off-by: Rahul Sharma <rahul.sharma(a)samsung.com> > --- > sound/soc/codecs/Kconfig | 4 + > sound/soc/codecs/Makefile | 2 + > sound/soc/codecs/exynos_hdmi_audio.c | 307 +++++++++++++++++++++++++++++++++++ > 3 files changed, 313 insertions(+) > create mode 100644 sound/soc/codecs/exynos_hdmi_audio.c > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > index b92759a..93f3f6b 100644 > --- a/sound/soc/codecs/Kconfig > +++ b/sound/soc/codecs/Kconfig > @@ -496,3 +496,7 @@ config SND_SOC_ML26124 > > config SND_SOC_TPA6130A2 > tristate > + > +config SND_SOC_EXYNOS_HDMI_AUDIO > + tristate > + default y Do you want to enable this by default? Shouldn't this be depending on HDMI support? > diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile > index 9bd4d95..bfe93e6 100644 > --- a/sound/soc/codecs/Makefile > +++ b/sound/soc/codecs/Makefile > @@ -112,6 +112,7 @@ snd-soc-wm9705-objs := wm9705.o > snd-soc-wm9712-objs := wm9712.o > snd-soc-wm9713-objs := wm9713.o > snd-soc-wm-hubs-objs := wm_hubs.o > +snd-soc-exynos-hdmi-audio-objs := exynos_hdmi_audio.o > > # Amp > snd-soc-max9877-objs := max9877.o > @@ -230,6 +231,7 @@ obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o > obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o > obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o > obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o > +obj-$(CONFIG_SND_SOC_EXYNOS_HDMI_AUDIO) += snd-soc-exynos-hdmi-audio.o > > # Amp > obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o > diff --git a/sound/soc/codecs/exynos_hdmi_audio.c b/sound/soc/codecs/exynos_hdmi_audio.c > new file mode 100644 > index 0000000..50e8564 > --- /dev/null > +++ b/sound/soc/codecs/exynos_hdmi_audio.c > @@ -0,0 +1,307 @@ > +/* > + * ALSA SoC codec driver for HDMI audio on Samsung Exynos processors. > + * Copyright (C) 2012 Samsung corp. Copyright (c) 2012 (-13?) Samsung Electronics Co., Ltd. > + * Author: Rahul Sharma <rahul.sharma(a)samsung.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. > + * > + */ > +#include <linux/module.h> > +#include <linux/delay.h> > +#include <sound/soc.h> > +#include <video/display.h> > +#include <video/exynos_hdmi.h> > +#include <sound/pcm.h> > +#include <sound/pcm_params.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > + > +#undef dev_info > + > +#define dev_info(dev, format, arg...) \ > + dev_printk(KERN_CRIT, dev, format, ##arg) You may directly use dev_crit instead of dev_printk. > + > +static struct snd_soc_codec_driver hdmi_codec; > + > +/* platform device pointer for eynos hdmi audio device. */ > +static struct platform_device *exynos_hdmi_audio_pdev; > + > +struct hdmi_audio_context { > + struct platform_device *pdev; > + atomic_t plugged; > + struct display_entity_audio_params audio_params; > + struct display_entity *entity; > + struct display_entity_notifier notf; > + struct display_event_subscriber subscriber; > +}; > + > +static int exynos_hdmi_audio_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct hdmi_audio_context *ctx = snd_soc_codec_get_drvdata(codec); > + int ret; > + > + dev_info(codec->dev, "[%d] %s\n", __LINE__, __func__); How about making this a debug message as it does not convey anything useful? > + > + ctx->audio_params.type = DISPLAY_ENTITY_AUDIO_I2S; > + > + switch (params_channels(params)) { > + case 6: > + case 4: > + case 2: > + case 1: > + ctx->audio_params.channels = params_channels(params); > + break; > + default: > + dev_err(codec->dev, "%d channels not supported\n", > + params_channels(params)); > + return -EINVAL; > + } > + > + switch (params_format(params)) { > + case SNDRV_PCM_FORMAT_S8: > + ctx->audio_params.bits_per_sample = 8; > + break; > + case SNDRV_PCM_FORMAT_S16_LE: > + ctx->audio_params.bits_per_sample = 12; > + break; > + case SNDRV_PCM_FORMAT_S24_LE: > + ctx->audio_params.bits_per_sample = 16; > + break; > + default: > + dev_err(codec->dev, "Format(%d) not supported\n", > + params_format(params)); > + return -EINVAL; > + } > + > + switch (params_rate(params)) { > + case 32000: > + case 44100: > + case 88200: > + case 176400: > + case 48000: > + case 96000: > + case 192000: > + ctx->audio_params.sf = params_rate(params); > + break; > + default: > + dev_err(codec->dev, "%d Rate supported\n", > + params_rate(params)); > + return -EINVAL; > + } > + > + /* checking here to cache audioparms for hpd plug handling */ > + if (!atomic_read(&ctx->plugged)) > + return -EINVAL; > + > + ret = > + display_entity_hdmi_init_audio(ctx->entity, &ctx->audio_params); > + return ret; > +} > + > +static int exynos_hdmi_audio_trigger(struct snd_pcm_substream *substream, > + int cmd, struct snd_soc_dai *dai) > +{ > + struct snd_soc_codec *codec = dai->codec; > + struct hdmi_audio_context *ctx = snd_soc_codec_get_drvdata(codec); > + int ret; > + > + dev_info(codec->dev, "[%d] %s\n", __LINE__, __func__); ditto > + > + /* checking here to cache audioparms for hpd plug handling */ > + if (!atomic_read(&ctx->plugged)) > + return -EINVAL; > + > + switch (cmd) { > + case SNDRV_PCM_TRIGGER_START: > + ret = display_entity_hdmi_set_audiostate(ctx->entity, > + DISPLAY_ENTITY_AUDIOSTATE_ON); > + if (ret) { > + dev_err(codec->dev, "audio enable failed.\n"); > + return -EINVAL; > + } > + break; > + case SNDRV_PCM_TRIGGER_STOP: > + ret = display_entity_hdmi_set_audiostate(ctx->entity, > + DISPLAY_ENTITY_AUDIOSTATE_OFF); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + > + return ret; > +} > + > +static const struct snd_soc_dai_ops exynos_hdmi_audio_dai_ops = { > + .hw_params = exynos_hdmi_audio_hw_params, > + .trigger = exynos_hdmi_audio_trigger, > +}; > + > +static struct snd_soc_dai_driver hdmi_codec_dai = { > + .name = "exynos-hdmi-audio", > + .playback = { > + .channels_min = 2, > + .channels_max = 8, > + .rates = SNDRV_PCM_RATE_32000 | > + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | > + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | > + SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000, > + .formats = SNDRV_PCM_FMTBIT_S16_LE | > + SNDRV_PCM_FMTBIT_S24_LE, > + }, > + .ops = &exynos_hdmi_audio_dai_ops, > +}; > + > +void hdmi_audio_event_notify(struct display_entity *entity, > + enum display_entity_event_type type, > + unsigned int value, void *context) > +{ > + struct hdmi_audio_context *ctx = (struct hdmi_audio_context *)context; > + > + if (type == DISPLAY_ENTITY_HDMI_HOTPLUG) { > + dev_info(&ctx->pdev->dev, "[%d][%s] hpd(%d)\n", __LINE__, > + __func__, value); > + atomic_set(&ctx->plugged, !!value); > + } > +} > + > +int exynos_hdmi_audio_notification(struct display_entity_notifier *notf, > + struct display_entity *entity, int status) > +{ > + struct hdmi_audio_context *ctx = container_of(notf, > + struct hdmi_audio_context, notf); > + struct exynos_hdmi_control_ops *exynos_ops = > + (struct exynos_hdmi_control_ops *)entity->private; > + int hpd; > + > + if (status != DISPLAY_ENTITY_NOTIFIER_CONNECT && entity) > + return -EINVAL; > + > + dev_info(&ctx->pdev->dev, "[%d][%s]\n", __LINE__, __func__); > + > + ctx->entity = entity; > + > + ctx->subscriber.context = ctx; > + ctx->subscriber.notify = hdmi_audio_event_notify; > + > + display_entity_subscribe_event(entity, &ctx->subscriber); > + > + exynos_ops->get_hpdstate(entity, &hpd); > + atomic_set(&ctx->plugged, !!hpd); > + > + return 0; > +} > + > +static __devinit int hdmi_codec_probe(struct platform_device *pdev) __devinit is not necessary. +{ > + int ret; > + struct hdmi_audio_context *ctx; > + struct device_node *dev_node; > + struct platform_device *disp_pdev; > + > + dev_info(&pdev->dev, "[%d][%s]\n", __LINE__, __func__); > + > + ret = snd_soc_register_codec(&pdev->dev, &hdmi_codec, > + &hdmi_codec_dai, 1); > + > + if (ret) { > + dev_err(&pdev->dev, "register_codec failed (%d)\n", ret); > + return ret; > + } > + > + ctx = devm_kzalloc(&pdev->dev, sizeof(struct hdmi_audio_context), > + GFP_KERNEL); > + if (ctx == NULL) > + return -ENOMEM; > + > + ctx->pdev = pdev; > + atomic_set(&ctx->plugged, 0); > + platform_set_drvdata(pdev, ctx); > + > + dev_node = of_find_compatible_node(NULL, NULL, > + "samsung,exynos5-hdmi"); > + if (!dev_node) { > + dev_err(&pdev->dev, "[%d][%s] dt node not found.\n", > + __LINE__, __func__); > + return -EINVAL; > + } > + > + disp_pdev = of_find_device_by_node(dev_node); > + if (!disp_pdev) { > + dev_err(&pdev->dev, "[ERROR][%d][%s] No pdev\n", > + __LINE__, __func__); > + return -EINVAL; > + } > + > + ctx->notf.dev = &disp_pdev->dev; > + ctx->notf.notify = exynos_hdmi_audio_notification; > + > + ret = display_entity_register_notifier(&ctx->notf); > + if (ret) { > + dev_err(&pdev->dev, "[%d][%s] entity registe failed.\n", > + __LINE__, __func__); > + return -EINVAL; > + } > + return ret; > +} > + > +static __devexit int hdmi_codec_remove(struct platform_device *pdev) __devexit is not necessary. > +{ > + dev_info(&pdev->dev, " %s:%s:%d", __FILE__, __func__, __LINE__); > + mdelay(1000); > + > + snd_soc_unregister_codec(&pdev->dev); > + return 0; > +} > + > +static struct platform_driver hdmi_codec_driver = { > + .driver = { > + .name = "exynos-hdmi-audio-codec", > + .owner = THIS_MODULE, > + }, > + > + .probe = hdmi_codec_probe, > + .remove = __devexit_p(hdmi_codec_remove), > +}; > + > +static int __init hdmi_codec_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&hdmi_codec_driver); > + if (ret < 0) > + return -EINVAL; > + > + exynos_hdmi_audio_pdev = platform_device_register_simple > + ("exynos-hdmi-audio-codec", -1, NULL, 0); > + if (IS_ERR_OR_NULL(exynos_hdmi_audio_pdev)) { > + ret = PTR_ERR(exynos_hdmi_audio_pdev); > + platform_driver_unregister(&hdmi_codec_driver); > + return ret; > + } > + > + return 0; > +} > +static void __exit hdmi_codec_exit(void) > +{ > + platform_driver_unregister(&hdmi_codec_driver); > + platform_device_unregister(exynos_hdmi_audio_pdev); > +} > + > +module_init(hdmi_codec_init); > +module_exit(hdmi_codec_exit); > + > +MODULE_AUTHOR("Rahul Sharma <rahul.sharma(a)samsung.com>"); > +MODULE_DESCRIPTION("ASoC EXYNOS HDMI codec driver"); > +MODULE_LICENSE("GPL"); > +MODULE_ALIAS("platform:" DRV_NAME); > -- > 1.8.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- With warm regards, Sachin

2 1

[alsa-devel] [PATCH 0/2] ASoC: fsi: add DT support
by Kuninori Morimoto 14 Jan '13

14 Jan '13

Hi Mark These patches adds device tree support on FSI driver These are based on mark/topic/fsi branch Kuninori Morimoto (2): ASoC: fsi: don't use platform info pointer on probe() ASoC: fsi: add device tree support .../devicetree/bindings/sound/renesas,fsi.txt | 23 +++++ sound/soc/sh/fsi.c | 98 ++++++++++++++++---- 2 files changed, 104 insertions(+), 17 deletions(-) Best regards --- Kuninori Morimoto

2 7

Re: [alsa-devel] [PATCH v2 3/3] ASoC: tegra: add tegra machine driver using wm9712 codec
by Mark Brown 14 Jan '13

14 Jan '13

On Tue, Jan 08, 2013 at 11:52:33PM +0100, Lucas Stach wrote: > Am Dienstag, den 08.01.2013, 15:17 -0700 schrieb Stephen Warren: > > Hmmm. I thought that could be auto-instantiated based on probing the > > AC'97 bus for whatever was there? > AC97 is in principle probeable by reading the first regs of the codec, > but all the infrastructure to do proper hotplugging on the AC97 bus is > missing in the kernel. As I didn't want to be the one to add all this > infrastructure to a dying audio platform, I opted to do the same thing > as all the other platform using AC97 and instantiate the codec from the > machine driver. That's about the size of it, yes. We should write the device tree as though we'd got better infrastructure here since this isn't something that ought to be required but right now this is how you do AC'97 in ASoC. It'd be really nice if someone had the time to work on the AC'97 infrastructure here but I'd not hold my breath given that it's rarely used in new designs.

1 0

[alsa-devel] [PATCH 1/8] regmap: Add support for 24 bit wide register addresses
by Lars-Peter Clausen 13 Jan '13

13 Jan '13

Since regmap already has support for formatting 24 bit wide values, so adding support for 24 bit wide registers is pretty much straight forward. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- drivers/base/regmap/regmap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 42d5cb0..26af93a 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -500,6 +500,12 @@ struct regmap *regmap_init(struct device *dev, } break; + case 24: + if (reg_endian != REGMAP_ENDIAN_BIG) + goto err_map; + map->format.format_reg = regmap_format_24; + break; + case 32: switch (reg_endian) { case REGMAP_ENDIAN_BIG: -- 1.8.0

2 17

[alsa-devel] [PATCH] ASoC: simple-card: add asoc_simple_dai for initializing
by Kuninori Morimoto 13 Jan '13

13 Jan '13

Current simple-card driver calls asoc_simple_card_dai_init() if platform had a asoc_simple_card_dai_init pointer. And, this initialization function works only when platform has an applicable initial value for each dai settings. And basically, almost all sound card requires certain initialization. This means that almost all platform has initialization settings, and driver do nothing if it doesn't have settings. And additionally, current simple-card supports sysclk settings but it was only for codec. In order to abolish deviation between cpu and codec, and in order to simplify processing, this patch adds asoc_simple_dai, and removed pointless struct asoc_simple_dai_init_info which was trigger of calling asoc_simple_card_dai_init(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- >> Mark This patch is based on both mark/topic/simple-card and mark/topic/fsi. I used "git merge". Please let me know if I should rebase it. >> Simon Please give this patch your Acked-by, since it modifies mach-shmobile. arch/arm/mach-shmobile/board-ap4evb.c | 35 +++++++------- arch/arm/mach-shmobile/board-armadillo800eva.c | 34 +++++++------- arch/arm/mach-shmobile/board-kzm9g.c | 20 ++++---- arch/arm/mach-shmobile/board-mackerel.c | 35 +++++++------- arch/sh/boards/mach-ecovec24/setup.c | 19 ++++---- arch/sh/boards/mach-se/7724/setup.c | 21 ++++----- include/sound/simple_card.h | 12 ++--- sound/soc/generic/simple-card.c | 58 ++++++++++++------------ 8 files changed, 116 insertions(+), 118 deletions(-) diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 4c97903..08294fa 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -686,21 +686,21 @@ static struct platform_device fsi_device = { }, }; -static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = { - .fmt = SND_SOC_DAIFMT_LEFT_J, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, - .sysclk = 11289600, -}; - static struct asoc_simple_card_info fsi2_ak4643_info = { .name = "AK4643", .card = "FSI2A-AK4643", - .cpu_dai = "fsia-dai", .codec = "ak4642-codec.0-0013", .platform = "sh_fsi2", - .codec_dai = "ak4642-hifi", - .init = &fsi2_ak4643_init_info, + .daifmt = SND_SOC_DAIFMT_LEFT_J, + .cpu_dai = { + .name = "fsia-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS, + }, + .codec_dai = { + .name = "ak4642-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + .sysclk = 11289600, + }, }; static struct platform_device fsi_ak4643_device = { @@ -809,19 +809,18 @@ static struct platform_device lcdc1_device = { }, }; -static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { - .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_IB_NF, -}; - static struct asoc_simple_card_info fsi2_hdmi_info = { .name = "HDMI", .card = "FSI2B-HDMI", - .cpu_dai = "fsib-dai", .codec = "sh-mobile-hdmi", .platform = "sh_fsi2", - .codec_dai = "sh_mobile_hdmi-hifi", - .init = &fsi2_hdmi_init_info, + .cpu_dai = { + .name = "fsib-dai", + .fmt = SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF, + }, + .codec_dai = { + .name = "sh_mobile_hdmi-hifi", + }, }; static struct platform_device fsi_hdmi_device = { diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 042a21e..22a1cc5 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -807,21 +807,21 @@ static struct platform_device fsi_device = { }; /* FSI-WM8978 */ -static struct asoc_simple_dai_init_info fsi_wm8978_init_info = { - .fmt = SND_SOC_DAIFMT_I2S, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, - .sysclk = 12288000, -}; - static struct asoc_simple_card_info fsi_wm8978_info = { .name = "wm8978", .card = "FSI2A-WM8978", - .cpu_dai = "fsia-dai", .codec = "wm8978.0-001a", .platform = "sh_fsi2", - .codec_dai = "wm8978-hifi", - .init = &fsi_wm8978_init_info, + .daifmt = SND_SOC_DAIFMT_I2S, + .cpu_dai = { + .name = "fsia-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF, + }, + .codec_dai = { + .name = "wm8978-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF, + .sysclk = 12288000, + }, }; static struct platform_device fsi_wm8978_device = { @@ -833,18 +833,18 @@ static struct platform_device fsi_wm8978_device = { }; /* FSI-HDMI */ -static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { - .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM, -}; - static struct asoc_simple_card_info fsi2_hdmi_info = { .name = "HDMI", .card = "FSI2B-HDMI", - .cpu_dai = "fsib-dai", .codec = "sh-mobile-hdmi", .platform = "sh_fsi2", - .codec_dai = "sh_mobile_hdmi-hifi", - .init = &fsi2_hdmi_init_info, + .cpu_dai = { + .name = "fsib-dai", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + }, + .codec_dai = { + .name = "sh_mobile_hdmi-hifi", + }, }; static struct platform_device fsi_hdmi_device = { diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 9ca7ce5..f170aed 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -526,21 +526,21 @@ static struct platform_device fsi_device = { }, }; -static struct asoc_simple_dai_init_info fsi2_ak4648_init_info = { - .fmt = SND_SOC_DAIFMT_LEFT_J, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, - .sysclk = 11289600, -}; - static struct asoc_simple_card_info fsi2_ak4648_info = { .name = "AK4648", .card = "FSI2A-AK4648", - .cpu_dai = "fsia-dai", .codec = "ak4642-codec.0-0012", .platform = "sh_fsi2", - .codec_dai = "ak4642-hifi", - .init = &fsi2_ak4648_init_info, + .daifmt = SND_SOC_DAIFMT_LEFT_J, + .cpu_dai = { + .name = "fsia-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS, + }, + .codec_dai = { + .name = "ak4642-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + .sysclk = 11289600, + }, }; static struct platform_device fsi_ak4648_device = { diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index b5d210b..3fd716d 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -502,19 +502,18 @@ static struct platform_device hdmi_lcdc_device = { }, }; -static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { - .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_IB_NF, -}; - static struct asoc_simple_card_info fsi2_hdmi_info = { .name = "HDMI", .card = "FSI2B-HDMI", - .cpu_dai = "fsib-dai", .codec = "sh-mobile-hdmi", .platform = "sh_fsi2", - .codec_dai = "sh_mobile_hdmi-hifi", - .init = &fsi2_hdmi_init_info, + .cpu_dai = { + .name = "fsib-dai", + .fmt = SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF, + }, + .codec_dai = { + .name = "sh_mobile_hdmi-hifi", + }, }; static struct platform_device fsi_hdmi_device = { @@ -893,21 +892,21 @@ static struct platform_device fsi_device = { }, }; -static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = { - .fmt = SND_SOC_DAIFMT_LEFT_J, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, - .sysclk = 11289600, -}; - static struct asoc_simple_card_info fsi2_ak4643_info = { .name = "AK4643", .card = "FSI2A-AK4643", - .cpu_dai = "fsia-dai", .codec = "ak4642-codec.0-0013", .platform = "sh_fsi2", - .codec_dai = "ak4642-hifi", - .init = &fsi2_ak4643_init_info, + .daifmt = SND_SOC_DAIFMT_LEFT_J, + .cpu_dai = { + .name = "fsia-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS, + }, + .codec_dai = { + .name = "ak4642-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + .sysclk = 11289600, + }, }; static struct platform_device fsi_ak4643_device = { diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 8ebe4c7..065e9600 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -897,21 +897,20 @@ static struct platform_device fsi_device = { .resource = fsi_resources, }; -static struct asoc_simple_dai_init_info fsi_da7210_init_info = { - .fmt = SND_SOC_DAIFMT_I2S, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS | - SND_SOC_DAIFMT_IB_NF, -}; - static struct asoc_simple_card_info fsi_da7210_info = { .name = "DA7210", .card = "FSIB-DA7210", - .cpu_dai = "fsib-dai", .codec = "da7210.0-001a", .platform = "sh_fsi.0", - .codec_dai = "da7210-hifi", - .init = &fsi_da7210_init_info, + .daifmt = SND_SOC_DAIFMT_I2S, + .cpu_dai = { + .name = "fsib-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF, + }, + .codec_dai = { + .name = "da7210-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + }, }; static struct platform_device fsi_da7210_device = { diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 975608f..4010e63 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -299,22 +299,21 @@ static struct platform_device fsi_device = { .resource = fsi_resources, }; -static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = { - .fmt = SND_SOC_DAIFMT_LEFT_J, - .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, - .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS | - SND_SOC_DAIFMT_IB_NF, - .sysclk = 11289600, -}; - static struct asoc_simple_card_info fsi_ak4642_info = { .name = "AK4642", .card = "FSIA-AK4642", - .cpu_dai = "fsia-dai", .codec = "ak4642-codec.0-0012", .platform = "sh_fsi.0", - .codec_dai = "ak4642-hifi", - .init = &fsi2_ak4642_init_info, + .daifmt = SND_SOC_DAIFMT_LEFT_J, + .cpu_dai = { + .name = "fsia-dai", + .fmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF, + }, + .codec_dai = { + .name = "ak4642-hifi", + .fmt = SND_SOC_DAIFMT_CBM_CFM, + .sysclk = 11289600, + }, }; static struct platform_device fsi_ak4642_device = { diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h index 4b62b8d..6c74527 100644 --- a/include/sound/simple_card.h +++ b/include/sound/simple_card.h @@ -14,21 +14,21 @@ #include <sound/soc.h> -struct asoc_simple_dai_init_info { +struct asoc_simple_dai { + const char *name; unsigned int fmt; - unsigned int cpu_daifmt; - unsigned int codec_daifmt; unsigned int sysclk; }; struct asoc_simple_card_info { const char *name; const char *card; - const char *cpu_dai; const char *codec; const char *platform; - const char *codec_dai; - struct asoc_simple_dai_init_info *init; /* for snd_link.init */ + + unsigned int daifmt; + struct asoc_simple_dai cpu_dai; + struct asoc_simple_dai codec_dai; /* used in simple-card.c */ struct snd_soc_dai_link snd_link; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index bc050ec..6cf8355 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -16,33 +16,38 @@ #define asoc_simple_get_card_info(p) \ container_of(p->dai_link, struct asoc_simple_card_info, snd_link) +static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, + struct asoc_simple_dai *set, + unsigned int daifmt) +{ + int ret = 0; + + daifmt |= set->fmt; + + if (!ret && daifmt) + ret = snd_soc_dai_set_fmt(dai, daifmt); + + if (!ret && set->sysclk) + ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0); + + return ret; +} + static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct asoc_simple_card_info *cinfo = asoc_simple_get_card_info(rtd); - struct asoc_simple_dai_init_info *iinfo = cinfo->init; + struct asoc_simple_card_info *info = asoc_simple_get_card_info(rtd); struct snd_soc_dai *codec = rtd->codec_dai; struct snd_soc_dai *cpu = rtd->cpu_dai; - unsigned int cpu_daifmt = iinfo->fmt | iinfo->cpu_daifmt; - unsigned int codec_daifmt = iinfo->fmt | iinfo->codec_daifmt; + unsigned int daifmt = info->daifmt; int ret; - if (codec_daifmt) { - ret = snd_soc_dai_set_fmt(codec, codec_daifmt); - if (ret < 0) - return ret; - } - - if (iinfo->sysclk) { - ret = snd_soc_dai_set_sysclk(codec, 0, iinfo->sysclk, 0); - if (ret < 0) - return ret; - } + ret = __asoc_simple_card_dai_init(codec, &info->codec_dai, daifmt); + if (ret < 0) + return ret; - if (cpu_daifmt) { - ret = snd_soc_dai_set_fmt(cpu, cpu_daifmt); - if (ret < 0) - return ret; - } + ret = __asoc_simple_card_dai_init(cpu, &info->cpu_dai, daifmt); + if (ret < 0) + return ret; return 0; } @@ -59,10 +64,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev) if (!cinfo->name || !cinfo->card || - !cinfo->cpu_dai || !cinfo->codec || !cinfo->platform || - !cinfo->codec_dai) { + !cinfo->cpu_dai.name || + !cinfo->codec_dai.name) { dev_err(dev, "insufficient asoc_simple_card_info settings\n"); return -EINVAL; } @@ -72,14 +77,11 @@ static int asoc_simple_card_probe(struct platform_device *pdev) */ cinfo->snd_link.name = cinfo->name; cinfo->snd_link.stream_name = cinfo->name; - cinfo->snd_link.cpu_dai_name = cinfo->cpu_dai; + cinfo->snd_link.cpu_dai_name = cinfo->cpu_dai.name; cinfo->snd_link.platform_name = cinfo->platform; cinfo->snd_link.codec_name = cinfo->codec; - cinfo->snd_link.codec_dai_name = cinfo->codec_dai; - - /* enable snd_link.init if cinfo has settings */ - if (cinfo->init) - cinfo->snd_link.init = asoc_simple_card_dai_init; + cinfo->snd_link.codec_dai_name = cinfo->codec_dai.name; + cinfo->snd_link.init = asoc_simple_card_dai_init; /* * init snd_soc_card -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: tlv320dac33: Remove suspend/resume soc driver operations
by Peter Ujfalusi 13 Jan '13

13 Jan '13

With idle_bias_off these are no longer needed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- sound/soc/codecs/tlv320dac33.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 782b0cd..4f35839 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1452,20 +1452,6 @@ static int dac33_soc_remove(struct snd_soc_codec *codec) return 0; } -static int dac33_soc_suspend(struct snd_soc_codec *codec) -{ - dac33_set_bias_level(codec, SND_SOC_BIAS_OFF); - - return 0; -} - -static int dac33_soc_resume(struct snd_soc_codec *codec) -{ - dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - - return 0; -} - static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .read = dac33_read_reg_cache, .write = dac33_write_locked, @@ -1476,8 +1462,6 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .reg_cache_default = dac33_reg, .probe = dac33_soc_probe, .remove = dac33_soc_remove, - .suspend = dac33_soc_suspend, - .resume = dac33_soc_resume, .controls = dac33_snd_controls, .num_controls = ARRAY_SIZE(dac33_snd_controls), -- 1.8.1

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: Provide explicit trace of coefficient writes
by Mark Brown 12 Jan '13

12 Jan '13

Helpful for debugging. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 4a233b8..14af8e2 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -775,6 +775,9 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) return -ENOMEM; } + adsp_dbg(dsp, "%s.%d: Writing %d bytes at %x\n", + file, blocks, le32_to_cpu(blk->len), + reg); ret = regmap_raw_write(regmap, reg, blk->data, le32_to_cpu(blk->len)); if (ret != 0) { -- 1.7.10.4

1 0

[alsa-devel] [PATCH 0/2 v2] at91/ssc: fixes on ASoC tree for 3.8
by Nicolas Ferre 12 Jan '13

12 Jan '13

Hi Mark, Olof, Arnd, This series goes on top of Linus' v3.8-rc3 and fixes an error that we have while compiling DTBs for AT91: ERROR (phandle_references): Reference to non-existent node or label "pinctrl_ssc0_tx" ERROR: Input tree has errors, aborting (use -f to force output) make[3]: *** [arch/arm/boot/dts/at91sam9g20ek.dtb] Error 2 I have included pending material that is dealing with SSC and pinctrl. The pinctrl part can be merged more easily now that the big pinctrl update for AT91 has been merged upstream. This material was designed to enter Mark's fixes queue, but as discussed with Olof, we can imagine merging everything through arm-soc or split the series (of 2 patches) and let them progress upstream separated (option that I do not like even if I know that the consequences are not so dramatic). So please, Olof, if you feel confortable with this series, tell us what you prefer and we will make our best to make this material go forward... Thanks for your help, best regards, v2: - remove the fix for typo in SSC status property: already merged upstream Bo Shen (2): ARM: at91/dts: add pinctrl support for SSC peripheral ASoC: atmel-ssc: add pinctrl selection to driver arch/arm/boot/dts/at91sam9260.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/at91sam9263.dtsi | 36 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 36 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/at91sam9n12.dtsi | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/at91sam9x5.dtsi | 32 +++++++++++++++++++++++++------- drivers/misc/atmel-ssc.c | 8 ++++++++ 6 files changed, 149 insertions(+), 7 deletions(-) -- 1.8.0

4 7

[alsa-devel] sound/pci/hda/hda_hwdep.c:487 parse_hints() warn: inconsistent returns mutex:&codec->user_mutex: locked (478) unlocked (447, 449, 452, 457, 487)
by Fengguang Wu 12 Jan '13

12 Jan '13

Hi Takashi, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git master head: 02e5aa7b459f69538d4ec88658d064816a7692d6 commit: bea06a147981e88465f566acd6c6e98b297f7712 ALSA: hda - Protect user-defined arrays via mutex date: 3 hours ago sound/pci/hda/hda_hwdep.c:487 parse_hints() warn: inconsistent returns mutex:&codec->user_mutex: locked (478) unlocked (447,449,452,457,487) vim +487 sound/pci/hda/hda_hwdep.c 43b62713 Takashi Iwai 2009-03-02 441 char *key, *val; 43b62713 Takashi Iwai 2009-03-02 442 struct hda_hint *hint; bea06a14 Takashi Iwai 2013-01-10 443 int err = 0; 1e1be432 Takashi Iwai 2008-07-30 444 e7d2860b André Goddard Rosa 2009-12-14 445 buf = skip_spaces(buf); 43b62713 Takashi Iwai 2009-03-02 446 if (!*buf || *buf == '#' || *buf == '\n') 4ea6fbc8 Takashi Iwai 2009-06-17 @447 return 0; 43b62713 Takashi Iwai 2009-03-02 448 if (*buf == '=') 43b62713 Takashi Iwai 2009-03-02 @449 return -EINVAL; 43b62713 Takashi Iwai 2009-03-02 450 key = kstrndup_noeol(buf, 1024); 43b62713 Takashi Iwai 2009-03-02 451 if (!key) 1e1be432 Takashi Iwai 2008-07-30 @452 return -ENOMEM; 43b62713 Takashi Iwai 2009-03-02 453 /* extract key and val */ 43b62713 Takashi Iwai 2009-03-02 454 val = strchr(key, '='); 43b62713 Takashi Iwai 2009-03-02 455 if (!val) { 43b62713 Takashi Iwai 2009-03-02 456 kfree(key); 43b62713 Takashi Iwai 2009-03-02 @457 return -EINVAL; 43b62713 Takashi Iwai 2009-03-02 458 } 43b62713 Takashi Iwai 2009-03-02 459 *val++ = 0; e7d2860b André Goddard Rosa 2009-12-14 460 val = skip_spaces(val); 43b62713 Takashi Iwai 2009-03-02 461 remove_trail_spaces(key); 43b62713 Takashi Iwai 2009-03-02 462 remove_trail_spaces(val); bea06a14 Takashi Iwai 2013-01-10 463 mutex_lock(&codec->user_mutex); 43b62713 Takashi Iwai 2009-03-02 464 hint = get_hint(codec, key); 43b62713 Takashi Iwai 2009-03-02 465 if (hint) { 43b62713 Takashi Iwai 2009-03-02 466 /* replace */ 43b62713 Takashi Iwai 2009-03-02 467 kfree(hint->key); 43b62713 Takashi Iwai 2009-03-02 468 hint->key = key; 43b62713 Takashi Iwai 2009-03-02 469 hint->val = val; bea06a14 Takashi Iwai 2013-01-10 470 goto unlock; 43b62713 Takashi Iwai 2009-03-02 471 } 43b62713 Takashi Iwai 2009-03-02 472 /* allocate a new hint entry */ 43b62713 Takashi Iwai 2009-03-02 473 if (codec->hints.used >= MAX_HINTS) 43b62713 Takashi Iwai 2009-03-02 474 hint = NULL; 43b62713 Takashi Iwai 2009-03-02 475 else 43b62713 Takashi Iwai 2009-03-02 476 hint = snd_array_new(&codec->hints); 1e1be432 Takashi Iwai 2008-07-30 477 if (!hint) { 1e1be432 Takashi Iwai 2008-07-30 @478 return -ENOMEM; bea06a14 Takashi Iwai 2013-01-10 479 goto unlock; 1e1be432 Takashi Iwai 2008-07-30 480 } 43b62713 Takashi Iwai 2009-03-02 481 hint->key = key; 43b62713 Takashi Iwai 2009-03-02 482 hint->val = val; bea06a14 Takashi Iwai 2013-01-10 483 unlock: bea06a14 Takashi Iwai 2013-01-10 484 mutex_unlock(&codec->user_mutex); bea06a14 Takashi Iwai 2013-01-10 485 if (err) bea06a14 Takashi Iwai 2013-01-10 486 kfree(key); bea06a14 Takashi Iwai 2013-01-10 @487 return err; 4ea6fbc8 Takashi Iwai 2009-06-17 488 } 4ea6fbc8 Takashi Iwai 2009-06-17 489 4ea6fbc8 Takashi Iwai 2009-06-17 490 static ssize_t hints_store(struct device *dev, --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

2 1