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

[alsa-devel] [PATCH] ALSA: jack: fix a randconfig build issue
by Jie Yang 02 May '15

02 May '15

Building errors reported such as below when 'CONFIG_INPUT=m': ...undefined reference to `input_xxx'... Here change to enable SND_JACK selectively to fix the issue. Also remove the config 'SND_HDA_INPUT_JACK' which won't be used anymore. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/pci/hda/Kconfig | 10 +--------- sound/pci/hda/hda_codec.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 5c296d3..117bf5c 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -4,7 +4,7 @@ config SND_HDA tristate select SND_PCM select SND_VMASTER - select SND_JACK + select SND_JACK if INPUT=y || INPUT=SND select SND_HDA_CORE config SND_HDA_INTEL @@ -84,14 +84,6 @@ config SND_HDA_INPUT_BEEP_MODE Set 1 to always enable the digital beep interface for HD-audio by default. -config SND_HDA_INPUT_JACK - bool "Support jack plugging notification via input layer" - depends on INPUT=y || INPUT=SND - select SND_JACK - help - Say Y here to enable the jack plugging notification via - input layer. - config SND_HDA_PATCH_LOADER bool "Support initialization patch loading for HD-audio" select FW_LOADER diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 0f8b6b5..ed7e9cf 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -274,10 +274,8 @@ struct hda_codec { unsigned long jackpoll_interval; /* In jiffies. Zero means no poll, rely on unsol events */ struct delayed_work jackpoll_work; -#ifdef CONFIG_SND_HDA_INPUT_JACK /* jack detection */ struct snd_array jacks; -#endif int depop_delay; /* depop delay in ms, -1 for default delay time */ -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: jack: fix a randconfig build issue
by Jie Yang 02 May '15

02 May '15

There may be no input_dev for jack(e.g. phantom jack), when CONFIG_INPUT is not selected, building errors such as: undefined reference to `input_xxx'... Here add #ifdef judgement to fix the issue. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/jack.h | 2 ++ sound/core/jack.c | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 23bede1..c1010f9 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -72,7 +72,9 @@ enum snd_jack_types { #define SND_JACK_SWITCH_TYPES 6 struct snd_jack { +#ifdef CONFIG_INPUT struct input_dev *input_dev; +#endif struct list_head kctl_list; struct snd_card *card; int registered; diff --git a/sound/core/jack.c b/sound/core/jack.c index eb66327..3a1901e 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -32,6 +32,7 @@ struct snd_jack_kctl { unsigned int mask_bits; /* only masked status bits are reported via kctl */ }; +#ifdef CONFIG_INPUT static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { SW_HEADPHONE_INSERT, SW_MICROPHONE_INSERT, @@ -40,9 +41,11 @@ static int jack_switch_types[SND_JACK_SWITCH_TYPES] = { SW_VIDEOOUT_INSERT, SW_LINEIN_INSERT, }; +#endif static int snd_jack_dev_disconnect(struct snd_device *device) { +#ifdef CONFIG_INPUT struct snd_jack *jack = device->device_data; if (!jack->input_dev) @@ -54,7 +57,9 @@ static int snd_jack_dev_disconnect(struct snd_device *device) input_unregister_device(jack->input_dev); else input_free_device(jack->input_dev); + jack->input_dev = NULL; +#endif return 0; } @@ -83,11 +88,12 @@ static int snd_jack_dev_register(struct snd_device *device) { struct snd_jack *jack = device->device_data; struct snd_card *card = device->card; - int err, i; + int err = 0; snprintf(jack->name, sizeof(jack->name), "%s %s", card->shortname, jack->id); +#ifdef CONFIG_INPUT if (!jack->input_dev) return 0; @@ -98,7 +104,7 @@ static int snd_jack_dev_register(struct snd_device *device) jack->input_dev->dev.parent = snd_card_get_device_link(card); /* Add capabilities for any keys that are enabled */ - for (i = 0; i < ARRAY_SIZE(jack->key); i++) { + for (int i = 0; i < ARRAY_SIZE(jack->key); i++) { int testbit = SND_JACK_BTN_0 >> i; if (!(jack->type & testbit)) @@ -113,6 +119,7 @@ static int snd_jack_dev_register(struct snd_device *device) err = input_register_device(jack->input_dev); if (err == 0) jack->registered = 1; +#endif return err; } @@ -209,7 +216,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, struct snd_jack *jack; struct snd_jack_kctl *jack_kctl = NULL; int err; - int i; static struct snd_device_ops ops = { .dev_free = snd_jack_dev_free, .dev_register = snd_jack_dev_register, @@ -230,26 +236,31 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, /* don't creat input device for phantom jack */ if (!phantom_jack) { +#ifdef CONFIG_INPUT jack->input_dev = input_allocate_device(); if (jack->input_dev == NULL) { err = -ENOMEM; - goto fail_input; + goto error; } jack->input_dev->phys = "ALSA"; - jack->type = type; - - for (i = 0; i < SND_JACK_SWITCH_TYPES; i++) + for (int i = 0; i < SND_JACK_SWITCH_TYPES; i++) if (type & (1 << i)) input_set_capability(jack->input_dev, EV_SW, jack_switch_types[i]); +#endif + jack->type = type; } err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops); - if (err < 0) - goto fail_input; + if (err < 0) { +#ifdef CONFIG_INPUT + input_free_device(jack->input_dev); +#endif + goto error; + } jack->card = card; INIT_LIST_HEAD(&jack->kctl_list); @@ -261,8 +272,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, return 0; -fail_input: - input_free_device(jack->input_dev); +error: kfree(jack->id); kfree(jack); return err; @@ -281,11 +291,13 @@ EXPORT_SYMBOL(snd_jack_new); */ void snd_jack_set_parent(struct snd_jack *jack, struct device *parent) { +#ifdef CONFIG_INPUT WARN_ON(jack->registered); if (!jack->input_dev) return; jack->input_dev->dev.parent = parent; +#endif } EXPORT_SYMBOL(snd_jack_set_parent); @@ -340,7 +352,6 @@ EXPORT_SYMBOL(snd_jack_set_key); void snd_jack_report(struct snd_jack *jack, int status) { struct snd_jack_kctl *jack_kctl; - int i; if (!jack) return; @@ -349,10 +360,11 @@ void snd_jack_report(struct snd_jack *jack, int status) snd_kctl_jack_report(jack->card, jack_kctl->kctl, status & jack_kctl->mask_bits); +#ifdef CONFIG_INPUT if (!jack->input_dev) return; - for (i = 0; i < ARRAY_SIZE(jack->key); i++) { + for (int i = 0; i < ARRAY_SIZE(jack->key); i++) { int testbit = SND_JACK_BTN_0 >> i; if (jack->type & testbit) @@ -369,7 +381,7 @@ void snd_jack_report(struct snd_jack *jack, int status) } input_sync(jack->input_dev); - +#endif } EXPORT_SYMBOL(snd_jack_report); -- 1.9.1

3 6

Re: [alsa-devel] [PATCH 1/3] ASoC: Add gtm601 codec driver
by Mark Brown 01 May '15

01 May '15

On Thu, Apr 30, 2015 at 11:28:01PM +0200, Marek Belisko wrote: > select SND_SOC_WM9705 if SND_SOC_AC97_BUS > select SND_SOC_WM9712 if SND_SOC_AC97_BUS > select SND_SOC_WM9713 if SND_SOC_AC97_BUS > + select SND_SOC_GTM601 > help > +config SND_SOC_GTM601 > + tristate 'GTM601 UMTS modem audio codec' > + Keep Makefile and Kconfig sorted. > +/* > + * Note this is a simple chip with no configuration interface, sample rate is > + * determined automatically by examining the Master clock and Bit clock ratios > + */ > +#define GTM601_RATES (SNDRV_PCM_RATE_8000) Does it or doesn't it support multiple sample rates?

2 3

Re: [alsa-devel] [PATCH 4/4] ASoC: samsung: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:14AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 3/4] ASoC: fsl: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:13AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 2/4] ASoC: bt-sco: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:12AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

Re: [alsa-devel] [PATCH 1/4] ASoC: au1x: Constify platform_device_id
by Mark Brown 01 May '15

01 May '15

On Sat, May 02, 2015 at 01:00:11AM +0900, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. Applied, thanks.

1 0

[alsa-devel] [PATCH RFT] ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
by Axel Lin 01 May '15

01 May '15

mc13xxx_reg_rmw() won't change any bit if passing 0 to the mask field. Pass AUDIO_SSI_SEL instead of 0 for the mask field to set AUDIO_SSI_SEL bit. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Hi, I don't have this h/w for test, so please help review and test this patch. Thanks. sound/soc/codecs/mc13783.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 2ffb9a0..3d44fc5 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -623,14 +623,14 @@ static int mc13783_probe(struct snd_soc_codec *codec) AUDIO_SSI_SEL, 0); else mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC, - 0, AUDIO_SSI_SEL); + AUDIO_SSI_SEL, AUDIO_SSI_SEL); if (priv->dac_ssi_port == MC13783_SSI1_PORT) mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC, AUDIO_SSI_SEL, 0); else mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC, - 0, AUDIO_SSI_SEL); + AUDIO_SSI_SEL, AUDIO_SSI_SEL); return 0; } -- 2.1.0

3 2

[alsa-devel] [PATCH 1/3] ALSA: hda: add hdac_adsp_enable module flag
by Vinod Koul 01 May '15

01 May '15

Some Intel HDA controllers sport a DSP. These systems can also be enabled with ASoC HDA driver as well. So add a flag in hda-core to enable/disable aDSP This flag for now is false, and should be true once the ASoC based systems mature. The integrators/OS vendors can configure this flag based on system preference. Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- include/sound/hdaudio.h | 11 +++++++++++ sound/hda/hda_bus_type.c | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index b97c59eab7ab..015bec1079f9 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -12,6 +12,17 @@ #include <sound/memalloc.h> #include <sound/hda_verbs.h> +/* + * hdac_adsp_enable: exported HD-A aDSP enable configuration. + * + * Some Intel HDA controllers sport a DSP, for these platform we can bypass + * aDSP and use as regular HDA controller or enable aDSP and use aDSP + * along with I2S codecs etc. + * hdac_adsp_enable would enable the aDSP based HDA controller if the + * platform supports it + */ +extern bool hdac_adsp_enable; + /* codec node id */ typedef u16 hda_nid_t; diff --git a/sound/hda/hda_bus_type.c b/sound/hda/hda_bus_type.c index 519914a12e8a..80e0570ffbf4 100644 --- a/sound/hda/hda_bus_type.c +++ b/sound/hda/hda_bus_type.c @@ -10,6 +10,10 @@ MODULE_DESCRIPTION("HD-audio bus"); MODULE_LICENSE("GPL"); +bool hdac_adsp_enable = false; +module_param(hdac_adsp_enable, bool, 0444); +MODULE_PARM_DESC(hdac_adsp_enable, "Enable aDSP on Intel HDA based systems"); + static int hda_bus_match(struct device *dev, struct device_driver *drv) { struct hdac_device *hdev = dev_to_hdac_dev(dev); -- 1.9.1

4 14

Re: [alsa-devel] [PATCH 1/3] ASoC: Add gtm601 codec driver
by Paul Bolle 01 May '15

01 May '15

Just a nit: a license mismatch. On Thu, 2015-04-30 at 23:28 +0200, Marek Belisko wrote: > --- /dev/null > +++ b/sound/soc/codecs/gtm601.c > + * 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. This states the license is GPL v2 or later. > +MODULE_LICENSE("GPL v2"); And, according to include/linux/module.h, this states the license is (just) GPL v2. So I think either the comment at the top of this file or the ident used in the MODULE_LICESE() macro should change. Paul Bolle

2 1

Re: [alsa-devel] [PATCH 1/2] ASoC: zx: Add ZTE zx296702 pcm support
by Mark Brown 01 May '15

01 May '15

On Thu, Apr 30, 2015 at 12:07:29PM +0800, Jun Nie wrote: > +static const struct snd_pcm_hardware snd_zx_hardware = { > + .info = SNDRV_PCM_INFO_MMAP | > + SNDRV_PCM_INFO_MMAP_VALID | > + SNDRV_PCM_INFO_INTERLEAVED | > + SNDRV_PCM_INFO_PAUSE | > + SNDRV_PCM_INFO_RESUME | > + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, > + .period_bytes_min = 32, > + .period_bytes_max = 16 * 1024, > + .periods_min = 2, > + .periods_max = 32, > + .buffer_bytes_max = 60 * 1024, > +}; Can the generic DMA code not work this out by querying the dmaengine driver? > +int zx_pcm_platform_register(struct device *dev) > +{ > + return devm_snd_dmaengine_pcm_register(dev, &zx_dmaengine_pcm_config, > + SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME | > + SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); _NO_RESIDUE has been removed in current code, the core figures it out automatically. Like I said looking at the driver code I'm not clear why this is specifying _CUSTOM_CHANNEL_NAME either, it looked like the driver just used the one standard channel name.

1 0

Re: [alsa-devel] [PATCH 2/2] ASoC: zx: Add zx296702 SPDIF support
by Mark Brown 01 May '15

01 May '15

On Thu, Apr 30, 2015 at 12:07:30PM +0800, Jun Nie wrote: > Add zx296702 SPDIF support This is adding a new device with DT bindings but there is no bindings document. All new DT bindings must be documented. > --- /dev/null > +++ b/include/sound/zx_hdmi_audio.h > @@ -0,0 +1,7 @@ > +#ifndef __ZX_HDMI_AUDIO_H__ > +#define __ZX_HDMI_AUDIO_H__ > + > +int zx_hdmi_audio_cfg(int audio_codec, int audio_way, > + u32 sample_rate, u32 sample_len); > +void zx_hdmi_audio_en(int on); > +#endif /* __ZX_HDMI_AUDIO_H__ */ So this isn't a S/PDIF controller but rather a HDMI controller and from the looks of it one with yet another custom interface between the video part and the audio part. As I keep saying I'd really like to see more code sharing between the various controllers doing this. Please take a look at some of the other controllers and see what can be shared, and also at this: http://thread.gmane.org/gmane.comp.video.dri.devel/126588 series from Russell King. > +config ZX296702_SPDIF > + bool "ZX296702 spdif" > + select ZX_PCM_DMA > + help > + Say Y or M if you want to add support for codecs attached to the > + zx296702 spdif interface The indentation above looks inconsistent - probably a mix of tabs and spaces. > +static struct snd_dmaengine_dai_dma_data zx_spdif_pcm_stereo_out = { > + .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, > + .chan_name = "tx", > + .maxburst = 8, > +}; The DMA driver said it needed custom channel names but this looks like the standard "tx" for transmit? > +static int zx_spdif_dai_probe(struct snd_soc_dai *dai) > +{ > + struct zx_spdif_info *zx_spdif = dev_get_drvdata(dai->dev); > + > + snd_soc_dai_set_drvdata(dai, zx_spdif); > + zx_spdif_pcm_stereo_out.addr = zx_spdif->mapbase + ZX_DATA; > + snd_soc_dai_init_dma_data(dai, &zx_spdif_pcm_stereo_out, NULL); > + return 0; > +} This appears to be modifying a global variable rather than some driver data, please don't do that - store anything discovered per device at runtime in the driver datta. > +static void zx_spdif_chanstats(void __iomem *base, unsigned int rate) > +{ > + u32 cstas1; > + > + switch (rate) { > + case 22050: > + default: > + return; > + } This should handle and report errrors, not ignore them. > + return -EINVAL; > + } > + if (2 == params_channels(params)) > + val |= ZX_CTRL_DOUBLE_TRACK; > + else > + val |= ZX_CTRL_LEFT_TRACK; > + writel_relaxed(val, zx_spdif->reg_base + ZX_CTRL); Missing blank line between this and the above block and please reverse the arguments for the == - it's the more normal kernel coding style. > +#if defined(CONFIG_ZX_HDMI_SND_SPDIF) > + sample_len = params_physical_width(params); > + zx_hdmi_audio_cfg(1, 0, params_rate(params), sample_len); > +#endif But this is the S/PDIF dirver... in any case, this looks like something that depends on the hardware rather than something that should be a compile time option. We should be able to boot the same kernel on many systems. > + val = readl_relaxed(base + ZX_CTRL); > + val &= ~(ZX_CTRL_ENB_MASK | ZX_CTRL_TX_MASK); > + val |= on ? (ZX_CTRL_TX_OPEN | ZX_CTRL_ENB) > + : (ZX_CTRL_TX_CLOSE | ZX_CTRL_DNB); > + writel_relaxed(val, base + ZX_CTRL); Please don't use the ternery operator like this, it does nothing for legibility. > + if (clk_prepare_enable(zx_spdif->dai_clk)) > + return -EIO; Don't discard return values, pass them back. You should probably also be managing this clock at runtime to save power. > + &zx_spdif_dai, 1); > + if (ret) { > + dev_err(&pdev->dev, "Register DAI failed\n"); Print error codes as well.

1 0

[alsa-devel] [PATCH v2 1/5] ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macro
by Charles Keepax 01 May '15

01 May '15

xnitmes is clearly intended to be xnitems, but all other macros just refer to this as xitems, so change it to that. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- Changes since v1: - Use first entry of values array as off value for the mux Thanks, Charles include/sound/soc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index a73d855..45cfd69 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -190,8 +190,8 @@ #define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues} -#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \ - SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues) +#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \ + SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues) #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \ SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts) #define SOC_ENUM(xname, xenum) \ -- 1.7.2.5

2 7

[alsa-devel] [PATCH] ALSA: hda - Add headphone quirk for Lifebook E752
by Takashi Iwai 01 May '15

01 May '15

Fujitsu Lifebook E752 laptop needs a similar quirk done for Lifebook T731. Otherwise the headphone is always muted. Reported-and-tested-by: Christian Weber <we_chris(a)hotmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e2afd53cc14c..eb2fc79cbd32 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5119,6 +5119,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX), SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN), + SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN), SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC), SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC), SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_BXBT2807_MIC), -- 2.3.6

1 0

[alsa-devel] [PATCH] ASoC: fix simple_return.cocci warnings
by kbuild test robot 30 Apr '15

30 Apr '15

sound/soc/codecs/adau1977.c:496:5-8: WARNING: end returns can be simpified Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci CC: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- adau1977.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -493,10 +493,7 @@ static int adau1977_set_bias_level(struc break; } - if (ret) - return ret; - - return 0; + return ret; } static int adau1977_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,

2 1

[alsa-devel] [PATCH] ASoC: fix simple_return.cocci warnings
by kbuild test robot 30 Apr '15

30 Apr '15

sound/soc/codecs/ssm2518.c:521:5-8: WARNING: end returns can be simpified Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci CC: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- ssm2518.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -518,10 +518,7 @@ static int ssm2518_set_bias_level(struct break; } - if (ret) - return ret; - - return 0; + return ret; } static int ssm2518_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,

2 2

[alsa-devel] [PATCH] ASoC: davinci-mcasp: Correct pm status check in suspend callback
by Peter Ujfalusi 30 Apr '15

30 Apr '15

pm_runtime_enabled() will only tell if the pm runtime has been enabled for the device, which is done at probe time but will not tell the actual power state of the device. pm_runtime_active() provides this information. This patch fixes a kernel crash when doing suspend when McASP is not active. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Mark, can you schedule this for the next -rc? Thank you, Peter sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index ddf7e97d8f0b..1ab3fcdc6bba 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1247,7 +1247,7 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai) u32 reg; int i; - context->pm_state = pm_runtime_enabled(mcasp->dev); + context->pm_state = pm_runtime_active(mcasp->dev); if (!context->pm_state) pm_runtime_get_sync(mcasp->dev); -- 2.3.5

2 1

[alsa-devel] [PATCH v2 0/3] Calculate BCLK using TDM slots and remove channels rule
by Jyri Sarha 30 Apr '15

30 Apr '15

The first and the last patch are excatly the same as in the first series, but in the middle thee is a new patch to constraint out unsupported channel counts in multiple serializers case. - The first patch is a bug fix and also fixes Dan Carpenter's concern about stack usage in davinci_mcasp_hw_rule_channels() - The second is also a bug fix, even thou the bug has existed in the dirver for a very long time. It is just that nobody has used multiple serializers before. - The last patch is a simple optimization All the patches have been tested are internally reviewed. Jyri Sarha (3): ASoC: davinci-mcasp: Calculate BCLK using TDM slots and remove channels rule ASoC: davinci-mcasp: Channel count constraints for multi-serializer case ASoC: davinci-macsp: Optimize implicit BLCK sample-rate rule sound/soc/davinci/davinci-mcasp.c | 167 ++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 77 deletions(-) -- 1.9.1

2 4

[alsa-devel] ASoC fixes for v4.1
by Mark Brown 30 Apr '15

30 Apr '15

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031: Linux 4.1-rc1 (2015-04-26 17:59:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.1-rc1 for you to fetch changes up to d839c98f98826f0c13e46d5a4cecb46dd357b50e: Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'asoc/fix/tfa9879' into asoc-linus (2015-04-29 13:37:31 +0100) ---------------------------------------------------------------- ASoC: Fixes for v4.1 A few fixes for v4.1, none earth shattering and mostly driver related except for one change to fix !PM builds for Intel platforms which is done by adding stubs in the core so other platforms don't run into the same issue. ---------------------------------------------------------------- Axel Lin (1): ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit Bard Liao (2): ASoC: rt5677: add register patch for PLL ASoC: rt5677: fixed wrong DMIC ref clock Charles Keepax (1): ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE Fabio Estevam (1): ASoC: fsl_ssi: Fix platform_get_irq() error handling Fang, Yang A (1): ASoC: rt5645: Add ACPI match ID Jie Yang (1): ASoC: add static inline funcs to fix a compiling issue Jin Yao (1): ASoC: Intel: Remove invalid kfree of devm allocated data Kuninori Morimoto (1): ASoC: rsnd: set dmaen->chan = NULL when error case Mark Brown (5): Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm', 'asoc/fix/qcom' and 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 'asoc/fix/tfa9879' into asoc-linus Rajeev Kumar (1): ASoC: Update email-id of Rajeev Kumar Takashi Iwai (1): ASoC: qcom: Return an error for invalid PCM trigger command Vinod Koul (1): ASoC: Intel: fix the makefile for atom code Wei Yongjun (3): ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe() ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe() ASoC: Intel: sst_byt: remove kfree for memory allocated with devm_kzalloc include/sound/designware_i2s.h | 2 +- include/sound/soc-dapm.h | 2 +- include/sound/soc.h | 12 ++++++++++++ include/sound/spear_dma.h | 2 +- sound/soc/codecs/rt5645.c | 13 ++++++++++++- sound/soc/codecs/rt5677.c | 5 ++++- sound/soc/codecs/tfa9879.c | 4 ++-- sound/soc/fsl/fsl_ssi.c | 2 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 1 - sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - sound/soc/qcom/lpass-cpu.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 4 ++-- sound/soc/sh/rcar/dma.c | 1 + 14 files changed, 39 insertions(+), 14 deletions(-)

2 1

[alsa-devel] [PATCH 1/5] ASoC: Correct typo in SOC_VALUE_ENUM_SINGLE macro
by Charles Keepax 30 Apr '15

30 Apr '15

xnitmes is clearly intended to be xnitems, but all other macros just refer to this as xitems, so change it to that. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- include/sound/soc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index a73d855..45cfd69 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -190,8 +190,8 @@ #define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues} -#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \ - SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues) +#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xitems, xtexts, xvalues) \ + SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xitems, xtexts, xvalues) #define SOC_ENUM_SINGLE_VIRT(xitems, xtexts) \ SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, xitems, xtexts) #define SOC_ENUM(xname, xenum) \ -- 1.7.2.5

3 8

[alsa-devel] [RFC 0/7] ASoC: hda - ASoC DSP widget event handlers
by Vinod Koul 30 Apr '15

30 Apr '15

The aDSP is triggered by DAPM. The DAPM code is atm dependent upon the DFW aka tplg RFC send by Liam. We will post missing tplg to driver links once that series is accepted This series is dependent upon a) Takashi topic/hda which has core hdac splitup b) SKL PCM driver series, which adds the SKL HDA Platform driver c) SKL IPC series which sends IPCs to aDSP This last series adds the missing link between b) and c). Comments most welcome -- ~Vinod Jeeja KP (7): ASoC: hda: Add skl dsp init and registering with SST IPC lib ASoC: hda: add hepler to configure module params ASoC: hda: add FW module init/bind IPC ASoC: hda: add FW pipe create/delete/set_pipe_state IPC ASOC: hda: add DSP platfrom controls widget event handlers ASoC: hda: Add support for SSP register settings ASoC: hda: Apply dai params_fixup for DSP widgets include/sound/soc-hda-sst-dsp.h | 3 + sound/soc/hda/Kconfig | 1 + sound/soc/hda/Makefile | 3 +- sound/soc/hda/hda_dsp_controls.c | 913 ++++++++++++++++++++++++++++++++++++ sound/soc/hda/hda_dsp_controls.h | 338 +++++++++++++ sound/soc/hda/hda_dsp_ssp_config.c | 290 ++++++++++++ sound/soc/hda/hda_dsp_ssp_config.h | 423 +++++++++++++++++ sound/soc/hda/hda_skl.h | 108 ++++- sound/soc/hda/hda_soc_dsp.c | 702 +++++++++++++++++++++++++++ 9 files changed, 2767 insertions(+), 14 deletions(-) create mode 100644 sound/soc/hda/hda_dsp_controls.c create mode 100644 sound/soc/hda/hda_dsp_controls.h create mode 100644 sound/soc/hda/hda_dsp_ssp_config.c create mode 100644 sound/soc/hda/hda_dsp_ssp_config.h create mode 100644 sound/soc/hda/hda_soc_dsp.c -- 1.7.9.5

3 21

[alsa-devel] Simple Mixer help
by Bram Bos 30 Apr '15

30 Apr '15

I want to get access to the ALSA Simple Mixer interface, but rather than the 'default' sound device I want to target a specific USB sound device. I'm at a loss how to refer to it... I am using a modified version of the code below but I have no idea what to replace the "card" and "selem_name" strings with. The device name? The 'hwX.Y' string? And do I need to change the index#? Too many variables to solve this by trial and error. Any hints appreciated! void SetAlsaMasterVolume(long volume){ long min, max; snd_mixer_t *handle; snd_mixer_selem_id_t *sid; const char *card = "default"; const char *selem_name = "Master"; snd_mixer_open(&handle, 0); snd_mixer_attach(handle, card); snd_mixer_selem_register(handle, NULL, NULL); snd_mixer_load(handle); snd_mixer_selem_id_alloca(&sid); snd_mixer_selem_id_set_index(sid, 0); snd_mixer_selem_id_set_name(sid, selem_name); snd_mixer_elem_t* elem = snd_mixer_find_selem(handle, sid); snd_mixer_selem_get_playback_volume_range(elem, &min, &max); snd_mixer_selem_set_playback_volume_all(elem, volume * max / 100); snd_mixer_close(handle);}

3 4

[alsa-devel] [for-next] NULL pointer dereference in codec probe
by Jani Nikula 30 Apr '15

30 Apr '15

Hi all, our graphics QA found an issue [1] with the for-next branch of [2] merged on top of v4.1-rc1. Backtrace in the bug. I didn't really have time to look into the details, but just letting you know. BR, Jani. [1] https://bugs.freedesktop.org/show_bug.cgi?id=90229 [2] git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git -- Jani Nikula, Intel Open Source Technology Center

3 5

[alsa-devel] [PATCH lib 0/5] alsa-lib namehint fixes
by Takashi Iwai 30 Apr '15

30 Apr '15

Hi, here is a series of fixes for alsa-lib namehint stuff. Currently snd_device_name_hint() doesn't return proper lists except for PCM. Also it may do bogus free() or segfault for wrong operations. This patchset addresses such issues and also adds the missing hint descriptions to ctl, seq, hwdep, etc. Takashi === Takashi Iwai (5): namehint: Fix invalid list access in snd_device_name_hint() namehint: Fix the listing without device number namehint: Fix bad free with invalid iface name Allow hint for ctl, hwdep, timer and seq conf: Add hint descriptions to ctl, hwdep, seq and timer devices include/local.h | 2 ++ src/conf/alsa.conf | 15 ++++++++++++++- src/confmisc.c | 13 +++++++++++++ src/control/control_hw.c | 4 +--- src/control/control_shm.c | 7 ++----- src/control/namehint.c | 26 ++++++++++++-------------- src/hwdep/hwdep_hw.c | 4 +--- src/pcm/pcm.c | 12 ------------ src/pcm/pcm_local.h | 5 ++--- src/rawmidi/rawmidi.c | 18 ------------------ src/rawmidi/rawmidi_local.h | 2 +- src/seq/seq_hw.c | 4 +--- src/timer/timer_hw.c | 4 +--- src/timer/timer_query_hw.c | 4 +--- 14 files changed, 51 insertions(+), 69 deletions(-) -- 2.3.6

1 5

[alsa-devel] [PATCH v4 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
by Inha Song 30 Apr '15

30 Apr '15

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR. Changes in v4: - Set the hpdet_channel default value to HPDETL in variable declaration. - Fix the indentation in binding documentation. Changes in v3: - Set the hpdet_channel default value to HPDETL If the value is unknown or invalid. Changes in v2: - Use the value in pdata instead of hpdet_channel in extcon_info. - Wrap arizona_extcon_of_get in IS_ENABLED(CONFIG_OF). - Change hpdet_channel type to unsigned from signed in pdata. - Move ARIZONA_ACCDET_MODE_* define to dt-binding header and directly set it to pdata. Inha Song (2): extcon: arizona: Add support for select accessory detect mode when headphone detection mfd: arizona: Update DT binding to support hpdet channel Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++ drivers/extcon/extcon-arizona.c | 38 ++++++++++++++++++----- include/dt-bindings/mfd/arizona.h | 8 +++++ include/linux/mfd/arizona/pdata.h | 3 ++ 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/mfd/arizona.h -- 2.0.0.390.gcb682f8

4 7

[alsa-devel] [PATCH] ASoC: rt5645: fix implicit declaration error
by Bard Liao 30 Apr '15

30 Apr '15

kbuild robot reports a implicit declaration of function 'rt5645_irq_detection' error. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index a81a24f..8bad9fe 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2535,6 +2535,8 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) return rt5645->jack_type; } +static int rt5645_irq_detection(struct rt5645_priv *rt5645); + int rt5645_set_jack_detect(struct snd_soc_codec *codec, struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, struct snd_soc_jack *btn_jack) -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ALSA: hda - remove check on CONFIG_SND_HDA_I915 in azx_probe_continue()
by mengdong.lin＠intel.com 30 Apr '15

30 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> This is to avoid a build warning that label 'i915_power_fail' is defined but not used. There are already fake hda_i915 functions when CONFIG_SND_HDA_I915 is not defined, and error message for missing CONFIG_SND_HDA_I915 for the HD-A controller or codec that depends on i915 power well. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5aa5cfa..87df90d 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip) if (pci->device != 0x0f04 && pci->device != 0x2284) hda->need_i915_power = 1; - -#ifdef CONFIG_SND_HDA_I915 err = hda_i915_init(hda); if (err < 0) goto i915_power_fail; @@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip) "Cannot turn on display power on i915\n"); goto i915_power_fail; } -#endif } err = azx_first_init(chip); -- 1.9.1

2 1

[alsa-devel] [PATCH v3 0/5] ALSA: hda - remove unnecessary controller dependency on i915 gfx power
by mengdong.lin＠intel.com 30 Apr '15

30 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Mengdong Lin (5): ALSA: hda - implement a refcount for i915 power well switch ALSA: hda - allow a codec to control the link power ALSA: hda - implement link_power ops for i915 display power control ALSA: hda - divide controller and codec dependency on i915 gfx power well ALSA: hda - remove controller dependency on i915 power well for Baytrail/Braswell include/sound/hdaudio.h | 4 ++++ sound/hda/hdac_device.c | 15 ++++++++++++++ sound/pci/hda/hda_codec.c | 4 ++++ sound/pci/hda/hda_controller.c | 11 ++++++++++ sound/pci/hda/hda_controller.h | 2 ++ sound/pci/hda/hda_i915.c | 18 +++++++++++++---- sound/pci/hda/hda_intel.c | 46 ++++++++++++++++++++++++++++++++++-------- sound/pci/hda/hda_intel.h | 2 ++ sound/pci/hda/patch_hdmi.c | 9 +++++++++ 9 files changed, 99 insertions(+), 12 deletions(-) -- 1.9.1

3 8

[alsa-devel] [PATCH v2 0/8] Add support for Wolfson WM8998 and WM1814 codecs
by Richard Fitzgerald 30 Apr '15

30 Apr '15

This set of patches adds support for the Wolfson Microelectronics WM8998 and WM1814 codecs. Richard Fitzgerald (8): mfd: arizona: Split INx_MODE into two fields ASoC: arizona: add defines for single-input gain control mfd: arizona: Add support for WM8998 and WM1814 gpio: arizona: add support for WM8998 and WM1814 regulator: arizona: add support for WM8998 and WM1814 extcon: arizona: Add support for WM8998 and WM1814 ASoC: wm8998: Initial WM8998 codec driver Documentation: Add WM8998/WM1814 device tree bindings Documentation/devicetree/bindings/mfd/arizona.txt | 13 +- drivers/extcon/extcon-arizona.c | 33 +- drivers/gpio/gpio-arizona.c | 2 + drivers/mfd/Kconfig | 6 + drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 105 ++- drivers/mfd/arizona-i2c.c | 8 + drivers/mfd/arizona-irq.c | 9 + drivers/mfd/arizona.h | 5 + drivers/mfd/wm8998-tables.c | 1592 +++++++++++++++++++++ drivers/regulator/arizona-ldo1.c | 2 + include/linux/mfd/arizona/core.h | 3 + include/linux/mfd/arizona/pdata.h | 7 +- include/linux/mfd/arizona/registers.h | 247 +++- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 7 +- sound/soc/codecs/wm8998.c | 1394 ++++++++++++++++++ sound/soc/codecs/wm8998.h | 23 + 20 files changed, 3442 insertions(+), 32 deletions(-) create mode 100644 drivers/mfd/wm8998-tables.c create mode 100644 sound/soc/codecs/wm8998.c create mode 100644 sound/soc/codecs/wm8998.h -- 1.7.2.5

2 8

[alsa-devel] [PATCH V2 0/4] tas571x amplifier driver
by Kevin Cernekee 29 Apr '15

29 Apr '15

V1->V2: - Incorporate changes from review feedback - Change GPIOs to active low - Create a tas571x_chip struct to capture the growing list of differences between 5711 and 5717/5719 - Add register defaults for each chip - Extend regcache_sync_region() to allow it to sync with hardware registers that don't contain their power-on-reset values Kevin Cernekee (4): regmap: cache: Add "was_reset" argument to regcache_sync_region() ASoC: tas571x: Add DT binding document ASoC: tas571x: New driver for TI TAS571x power amplifiers MAINTAINERS: Add entry for tas571x ASoC codec driver .../devicetree/bindings/sound/tas571x.txt | 41 ++ MAINTAINERS | 6 + drivers/base/regmap/internal.h | 5 +- drivers/base/regmap/regcache-lzo.c | 2 +- drivers/base/regmap/regcache-rbtree.c | 5 +- drivers/base/regmap/regcache.c | 75 +-- drivers/media/radio/radio-si476x.c | 18 +- drivers/mfd/wm8994-core.c | 5 +- include/linux/regmap.h | 4 +- include/sound/hda_regmap.h | 3 +- sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas571x.c | 521 +++++++++++++++++++++ sound/soc/codecs/tas571x.h | 33 ++ sound/soc/codecs/wm8962.c | 3 +- 15 files changed, 680 insertions(+), 48 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt create mode 100644 sound/soc/codecs/tas571x.c create mode 100644 sound/soc/codecs/tas571x.h -- 2.2.0.rc0.207.ga3a616c

3 14

[alsa-devel] [PATCH utils 1/2] aplay: Fix type for signal flag
by Takashi Iwai 29 Apr '15

29 Apr '15

A flag used in signal handlers has to be a special atomic type, volatile sig_atomic_t. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- aplay/aplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index e58e1bcbdd7e..dfa1a0a95867 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -107,7 +107,7 @@ static snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; static int mmap_flag = 0; static int interleaved = 1; static int nonblock = 0; -static int in_aborting = 0; +static volatile sig_atomic_t in_aborting = 0; static u_char *audiobuf = NULL; static snd_pcm_uframes_t chunk_size = 0; static unsigned period_time = 0; -- 2.3.6

1 1

[alsa-devel] [TINYCOMPRESS][v2 PATCH 0/7] Convert build system to autotools
by Qais Yousef 29 Apr '15

29 Apr '15

This series converts the build system to use autotools and splits the files into lib and utils. Also patch 5 fixes error handling code. I can't test Android builds but both cross and native compiling worked for me. I left AUTHORS, ChangeLog and NEWS files empty. I used the license header to fill COPYING. Changes in v2: - Use -M option when generating the patches - Add Makefile.am to include directory that exports tinycompress.h - New patch (7) that fixes include dependency in tinycompress.h Qais Yousef (7): Convert the build system to autotools add .gitignore file makefile.linux: delete as no longer necessary/used Android.mk: Update to use the new location of source files compress.c: fix check for errors from poll(), read() and write() src/lib/utils.c: remove this empty file tinycompress.h: explicitly include required headers .gitignore | 39 ++++ AUTHORS | 0 Android.mk | 6 +- COPYING | 51 +++++ ChangeLog | 0 INSTALL | 365 ++++++++++++++++++++++++++++++++++++ Makefile.am | 3 + NEWS | 0 autogen.sh | 6 + configure.ac | 32 ++++ include/Makefile.am | 6 + include/tinycompress/tinycompress.h | 3 + m4/.place_holder | 0 makefile.linux | 41 ---- src/Makefile.am | 1 + src/lib/Makefile.am | 5 + compress.c => src/lib/compress.c | 22 ++- src/utils/Makefile.am | 11 ++ cplay.c => src/utils/cplay.c | 0 crec.c => src/utils/crec.c | 0 utils.c | 62 ------ 21 files changed, 537 insertions(+), 116 deletions(-) create mode 100644 .gitignore create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 NEWS create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 include/Makefile.am create mode 100644 m4/.place_holder delete mode 100644 makefile.linux create mode 100644 src/Makefile.am create mode 100644 src/lib/Makefile.am rename compress.c => src/lib/compress.c (98%) create mode 100644 src/utils/Makefile.am rename cplay.c => src/utils/cplay.c (100%) rename crec.c => src/utils/crec.c (100%) delete mode 100644 utils.c -- 2.1.0

2 14

[alsa-devel] [PATCH v2 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
by Inha Song 29 Apr '15

29 Apr '15

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR. Changes in v2: - Use the value in pdata instead of hpdet_channel in extcon_info. - Wrap arizona_extcon_of_get in IS_ENABLED(CONFIG_OF). - Change hpdet_channel type to unsigned from signed in pdata. - Move ARIZONA_ACCDET_MODE_* define to dt-binding header and directly set it to pdata. Inha Song (2): extcon: arizona: Add support for select accessory detect mode when headphone detection mfd: arizona: Update DT binding to support hpdet channel Documentation/devicetree/bindings/mfd/arizona.txt | 6 +++++ drivers/extcon/extcon-arizona.c | 28 ++++++++++++++++------- include/dt-bindings/mfd/arizona.h | 8 +++++++ include/linux/mfd/arizona/pdata.h | 3 +++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/mfd/arizona.h -- 2.0.0.390.gcb682f8

3 6

[alsa-devel] [PATCH 1/2] ASoC: rt5677: fixed wrong DMIC ref clock
by Bard Liao 29 Apr '15

29 Apr '15

DMIC clock source is not from codec system clock directly. it is generated from the division of system clock. And it should be 256 * sample rate of AIF1. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index fbe16ba..dca64ae 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -917,7 +917,7 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, { struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); - int idx = rl6231_calc_dmic_clk(rt5677->sysclk); + int idx = rl6231_calc_dmic_clk(rt5677->lrck[RT5677_AIF1] << 8); if (idx < 0) dev_err(codec->dev, "Failed to set DMIC clock\n"); -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [PATCH v3] ASoC: rt5645: Adds push button support for rt5650
by Bard Liao 29 Apr '15

29 Apr '15

rt5650 support headset button detection. Currently, the button detection is only implemented for rt5650 codec. The button detection configuration register's default value is different from rt5645. And we didn't touch the register in the driver, so we will get the wrong value when we dump the registers. We will fix it in another patch. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- * redo the using of rt5645_set_jack_detect base on the latest code base. --- sound/soc/codecs/rt5645.c | 266 +++++++++++++++++++++++++++----- sound/soc/codecs/rt5645.h | 8 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- 3 files changed, 237 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 2cab2eb..a81a24f 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2371,6 +2371,8 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5645_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + switch (level) { case SND_SOC_BIAS_PREPARE: if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { @@ -2401,8 +2403,9 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100); - snd_soc_update_bits(codec, RT5645_GEN_CTRL1, - RT5645_DIG_GATE_CTRL, 0); + if (!rt5645->en_button_func) + snd_soc_update_bits(codec, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, 0); snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2 | @@ -2417,28 +2420,71 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int rt5645_jack_detect(struct snd_soc_codec *codec) +static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec, + bool enable) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); - int gpio_state, jack_type = 0; - unsigned int val; - if (!gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - dev_err(codec->dev, "invalid gpio\n"); - return -EINVAL; + if (enable) { + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC R power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); + snd_soc_update_bits(codec, + RT5645_INT_IRQ_ST, 0x8, 0x8); + snd_soc_update_bits(codec, + RT5650_4BTN_IL_CMD2, 0x8000, 0x8000); + snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, + snd_soc_read(codec, RT5650_4BTN_IL_CMD1)); + } else { + snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0); + snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC R power"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); } - gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); +} - dev_dbg(codec->dev, "gpio = %d(%d)\n", rt5645->pdata.hp_det_gpio, - gpio_state); +static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + unsigned int val; - if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || - (!rt5645->pdata.gpio_hp_det_active_high && !gpio_state)) { - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (jack_insert) { + if (codec->component.card->instantiated) { + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias1"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + /* Power up necessary bits for JD if dapm is + not ready yet */ + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, + RT5645_PWR_MB1 | RT5645_PWR_MB2); + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, RT5645_PWR_LDO2); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, RT5645_PWR_MIC_DET); + } snd_soc_write(codec, RT5645_IN1_CTRL1, 0x0006); snd_soc_write(codec, RT5645_JD_CTRL3, 0x00b0); @@ -2452,32 +2498,62 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec) val = snd_soc_read(codec, RT5645_IN1_CTRL3) & 0x7; dev_dbg(codec->dev, "val = %d\n", val); - if (val == 1 || val == 2) - jack_type = SND_JACK_HEADSET; - else - jack_type = SND_JACK_HEADPHONE; + if (codec->component.card->instantiated) { + snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); + snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); + snd_soc_dapm_disable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, 0); + if (rt5645->pdata.jd_mode == 0) + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, 0); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, 0); + } - snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); - if (rt5645->pdata.jd_mode == 0) - snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (val == 1 || val == 2) { + rt5645->jack_type = SND_JACK_HEADSET; + if (rt5645->en_button_func) { + msleep(100); + rt5645_enable_push_button_irq(codec, true); + } + } else { + rt5645->jack_type = SND_JACK_HEADPHONE; + } + + } else { /* jack out */ + rt5645->jack_type = 0; + if (rt5645->en_button_func) + rt5645_enable_push_button_irq(codec, false); } - snd_soc_jack_report(rt5645->hp_jack, jack_type, SND_JACK_HEADPHONE); - snd_soc_jack_report(rt5645->mic_jack, jack_type, SND_JACK_MICROPHONE); - return 0; + return rt5645->jack_type; } int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack) + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); rt5645->hp_jack = hp_jack; rt5645->mic_jack = mic_jack; - rt5645_jack_detect(codec); + rt5645->btn_jack = btn_jack; + if (rt5645->btn_jack && rt5645->codec_type == CODEC_TYPE_RT5650) { + rt5645->en_button_func = true; + regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, + RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ); + regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1, + RT5645_HP_CB_MASK, RT5645_HP_CB_PU); + regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); + } + rt5645_irq_detection(rt5645); return 0; } @@ -2488,7 +2564,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) struct rt5645_priv *rt5645 = container_of(work, struct rt5645_priv, jack_detect_work.work); - rt5645_jack_detect(rt5645->codec); + rt5645_irq_detection(rt5645); } static irqreturn_t rt5645_irq(int irq, void *data) @@ -2501,6 +2577,125 @@ static irqreturn_t rt5645_irq(int irq, void *data) return IRQ_HANDLED; } +static int rt5645_button_detect(struct snd_soc_codec *codec) +{ + int btn_type, val; + + val = snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("val=0x%x\n", val); + btn_type = val & 0xfff0; + snd_soc_write(codec, RT5650_4BTN_IL_CMD1, val); + + return btn_type; +} + +static int rt5645_irq_detection(struct rt5645_priv *rt5645) +{ + int val, btn_type, gpio_state = 0, report = 0; + + switch (rt5645->pdata.jd_mode) { + case 0: /* Not using rt5645 JD */ + if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { + gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); + dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n", + rt5645->pdata.hp_det_gpio, gpio_state); + } + if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || + (!rt5645->pdata.gpio_hp_det_active_high && + !gpio_state)) { + report = rt5645_jack_detect(rt5645->codec, 1); + } else { + report = rt5645_jack_detect(rt5645->codec, 0); + } + snd_soc_jack_report(rt5645->hp_jack, + report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, + report, SND_JACK_MICROPHONE); + return report; + case 1: /* 2 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0070; + break; + default: /* 1 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0020; + break; + + } + + switch (val) { + /* jack in */ + case 0x30: /* 2 port */ + case 0x0: /* 1 port or 2 port */ + if (rt5645->jack_type == 0) { + report = rt5645_jack_detect(rt5645->codec, 1); + /* for push button and jack out */ + break; + } + btn_type = 0; + if (snd_soc_read(rt5645->codec, RT5645_INT_IRQ_ST) & 0x4) { + /* button pressed */ + report = SND_JACK_HEADSET; + btn_type = rt5645_button_detect(rt5645->codec); + /* rt5650 can report three kinds of button behavior, + one click, double click and hold. However, + currently we will report button pressed/released + event. So all the three button behaviors are + treated as button pressed. */ + switch (btn_type) { + case 0x8000: + case 0x4000: + case 0x2000: + report |= SND_JACK_BTN_0; + break; + case 0x1000: + case 0x0800: + case 0x0400: + report |= SND_JACK_BTN_1; + break; + case 0x0200: + case 0x0100: + case 0x0080: + report |= SND_JACK_BTN_2; + break; + case 0x0040: + case 0x0020: + case 0x0010: + report |= SND_JACK_BTN_3; + break; + case 0x0000: /* unpressed */ + break; + default: + dev_err(rt5645->codec->dev, + "Unexpected button code 0x%04x\n", + btn_type); + break; + } + } + if (btn_type == 0)/* button release */ + report = rt5645->jack_type; + + break; + /* jack out */ + case 0x70: /* 2 port */ + case 0x10: /* 2 port */ + case 0x20: /* 1 port */ + report = 0; + snd_soc_update_bits(rt5645->codec, + RT5645_INT_IRQ_ST, 0x1, 0x0); + rt5645_jack_detect(rt5645->codec, 0); + break; + default: + break; + } + + snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); + if (rt5645->en_button_func) + snd_soc_jack_report(rt5645->btn_jack, + report, SND_JACK_MICROPHONE); + + return report; +} + static int rt5645_probe(struct snd_soc_codec *codec) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); @@ -2840,8 +3035,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (rt5645->pdata.en_jd_func) { regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL3, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU); + RT5645_IRQ_CLK_GATE_CTRL, RT5645_IRQ_CLK_GATE_CTRL); regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, RT5645_CBJ_BST1_EN, RT5645_CBJ_BST1_EN); regmap_update_bits(rt5645->regmap, RT5645_JD_CTRL3, diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index db78e94..4473636 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2184,6 +2184,7 @@ struct rt5645_priv { struct i2c_client *i2c; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; + struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; int codec_type; @@ -2196,9 +2197,12 @@ struct rt5645_priv { int pll_src; int pll_in; int pll_out; + + int jack_type; + bool en_button_func; }; int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack); - + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack); #endif /* __RT5645_H__ */ diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 20a28b2..26e01f3 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -185,7 +185,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack); + rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL); return ret; } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [RFC 0/9] Add SKL ipc handling code
by Vinod Koul 29 Apr '15

29 Apr '15

This series adds support for managing DSP and posting IPC and processing IPC replies. Subhransu S. Prusty (9): ASoC: hda: Add helper to read/write to dsp mmio space ASoC: hda: Add IPC library for SKL platform ASoC: hda: Add config option for SKL ipc library ASoC: hda: Add DSP init and boot up functionality ASoC: hda: Add dsp loader ops ASoC: hda: Add Code Loader DMA support ASoC: hda: Add DSP library functions for SKL platform ASoC: hda: Add for CL DMA interrupt handling ASoC: hda: Export API to change DSP power state include/sound/soc-hda-sst-cldma.h | 234 ++++++++ include/sound/soc-hda-sst-dsp.h | 266 +++++++++ include/sound/soc-hda-sst-ipc.h | 134 +++++ sound/soc/hda/Kconfig | 7 + sound/soc/hda/Makefile | 3 + sound/soc/hda/intel/Makefile | 6 + sound/soc/hda/intel/soc-hda-sst-cldma.c | 297 +++++++++ sound/soc/hda/intel/soc-hda-sst-dsp.c | 510 ++++++++++++++++ sound/soc/hda/intel/soc-hda-sst-ipc.c | 963 ++++++++++++++++++++++++++++++ sound/soc/hda/intel/soc-hda-sst-skl-fw.h | 163 +++++ sound/soc/hda/intel/soc-hda-sst-skl.c | 292 +++++++++ 11 files changed, 2875 insertions(+) create mode 100644 include/sound/soc-hda-sst-cldma.h create mode 100644 include/sound/soc-hda-sst-dsp.h create mode 100644 include/sound/soc-hda-sst-ipc.h create mode 100644 sound/soc/hda/intel/Makefile create mode 100644 sound/soc/hda/intel/soc-hda-sst-cldma.c create mode 100644 sound/soc/hda/intel/soc-hda-sst-dsp.c create mode 100644 sound/soc/hda/intel/soc-hda-sst-ipc.c create mode 100644 sound/soc/hda/intel/soc-hda-sst-skl-fw.h create mode 100644 sound/soc/hda/intel/soc-hda-sst-skl.c -- 1.7.9.5

3 33

[alsa-devel] [PATCH 1/2] ASoC: Intel: Support rt5650 codec for Cherrytrail & Braswell
by yang.a.fang＠intel.com 29 Apr '15

29 Apr '15

From: "Fang, Yang A" <yang.a.fang(a)intel.com> rt5650 and rt5645 are similar codec so reuse the cht_bsw_rt5645 driver Signed-off-by: Fang, Yang A <yang.a.fang(a)intel.com> --- sound/soc/intel/Kconfig | 7 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 108 +++++++++++++++++++++++++------ 2 files changed, 94 insertions(+), 21 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ee03dbd..63d7659 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -112,12 +112,13 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH If unsure select "N". config SND_SOC_INTEL_CHT_BSW_RT5645_MACH - tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645 codec" - depends on X86_INTEL_LPSS + tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS + select SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5645 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI help This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell - platforms with RT5645 audio codec. + platforms with RT5645/5650 audio codec. If unsure select "N". diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 20a28b2..8115444 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -21,6 +21,7 @@ */ #include <linux/module.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <sound/pcm.h> @@ -33,9 +34,16 @@ #define CHT_PLAT_CLK_3_HZ 19200000 #define CHT_CODEC_DAI "rt5645-aif1" +struct cht_acpi_card { + char *codec_id; + int codec_type; + struct snd_soc_card *soc_card; +}; + struct cht_mc_private { struct snd_soc_jack hp_jack; struct snd_soc_jack mic_jack; + struct cht_acpi_card *acpi_card; }; static inline struct snd_soc_dai *cht_get_codec_dai(struct snd_soc_card *card) @@ -94,7 +102,7 @@ static const struct snd_soc_dapm_widget cht_dapm_widgets[] = { platform_clock_control, SND_SOC_DAPM_POST_PMD), }; -static const struct snd_soc_dapm_route cht_audio_map[] = { +static const struct snd_soc_dapm_route cht_5645_audio_map[] = { {"IN1P", NULL, "Headset Mic"}, {"IN1N", NULL, "Headset Mic"}, {"DMIC L1", NULL, "Int Mic"}, @@ -115,6 +123,27 @@ static const struct snd_soc_dapm_route cht_audio_map[] = { {"Ext Spk", NULL, "Platform Clock"}, }; +static const struct snd_soc_dapm_route cht_5650_audio_map[] = { + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + {"DMIC L2", NULL, "Int Mic"}, + {"DMIC R2", NULL, "Int Mic"}, + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"Ext Spk", NULL, "SPOL"}, + {"Ext Spk", NULL, "SPOR"}, + {"AIF1 Playback", NULL, "ssp2 Tx"}, + {"ssp2 Tx", NULL, "codec_out0"}, + {"ssp2 Tx", NULL, "codec_out1"}, + {"codec_in0", NULL, "ssp2 Rx" }, + {"codec_in1", NULL, "ssp2 Rx" }, + {"ssp2 Rx", NULL, "AIF1 Capture"}, + {"Headphone", NULL, "Platform Clock"}, + {"Headset Mic", NULL, "Platform Clock"}, + {"Int Mic", NULL, "Platform Clock"}, + {"Ext Spk", NULL, "Platform Clock"}, +}; + static const struct snd_kcontrol_new cht_mc_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -239,7 +268,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .codec_dai_name = "snd-soc-dummy-dai", .codec_name = "snd-soc-dummy", .platform_name = "sst-mfld-platform", - .ignore_suspend = 1, + .nonatomic = true, .dynamic = 1, .dpcm_playback = 1, .dpcm_capture = 1, @@ -267,7 +296,7 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBS_CFS, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .ignore_suspend = 1, + .nonatomic = true, .dpcm_playback = 1, .dpcm_capture = 1, .ops = &cht_be_ssp2_ops, @@ -275,43 +304,86 @@ static struct snd_soc_dai_link cht_dailink[] = { }; /* SoC card */ -static struct snd_soc_card snd_soc_card_cht = { - .name = "chtrt5645", - .dai_link = cht_dailink, - .num_links = ARRAY_SIZE(cht_dailink), - .dapm_widgets = cht_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cht_dapm_widgets), - .dapm_routes = cht_audio_map, - .num_dapm_routes = ARRAY_SIZE(cht_audio_map), - .controls = cht_mc_controls, - .num_controls = ARRAY_SIZE(cht_mc_controls), +static struct snd_soc_card snd_soc_card_cht[] = { + { + .name = "chtrt5645", + .dai_link = cht_dailink, + .num_links = ARRAY_SIZE(cht_dailink), + .dapm_widgets = cht_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cht_dapm_widgets), + .dapm_routes = cht_5645_audio_map, + .num_dapm_routes = ARRAY_SIZE(cht_5645_audio_map), + .controls = cht_mc_controls, + .num_controls = ARRAY_SIZE(cht_mc_controls), + }, + { + .name = "chtrt5650", + .dai_link = cht_dailink, + .num_links = ARRAY_SIZE(cht_dailink), + .dapm_widgets = cht_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cht_dapm_widgets), + .dapm_routes = cht_5650_audio_map, + .num_dapm_routes = ARRAY_SIZE(cht_5650_audio_map), + .controls = cht_mc_controls, + .num_controls = ARRAY_SIZE(cht_mc_controls), + } }; +static struct cht_acpi_card snd_soc_cards[] = { + {"10EC5645", CODEC_TYPE_RT5645, &snd_soc_card_cht[0]}, + {"10EC5650", CODEC_TYPE_RT5650, &snd_soc_card_cht[1]}, +}; + +static acpi_status snd_acpi_codec_match(acpi_handle handle, u32 level, + void *context, void **ret) +{ + *(bool *)context = true; + return AE_OK; +} + static int snd_cht_mc_probe(struct platform_device *pdev) { int ret_val = 0; + int i; struct cht_mc_private *drv; + struct snd_soc_card *card = snd_soc_cards[0].soc_card; + bool found = false; + char codec_name[32]; drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC); if (!drv) return -ENOMEM; - snd_soc_card_cht.dev = &pdev->dev; - snd_soc_card_set_drvdata(&snd_soc_card_cht, drv); - ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht); + for (i = 0; i < ARRAY_SIZE(snd_soc_cards); i++) { + if (ACPI_SUCCESS(acpi_get_devices( + snd_soc_cards[i].codec_id, + snd_acpi_codec_match, + &found, NULL)) && found) { + dev_dbg(&pdev->dev, + "found codec %s\n", snd_soc_cards[i].codec_id); + card = snd_soc_cards[i].soc_card; + drv->acpi_card = &snd_soc_cards[i]; + break; + } + } + card->dev = &pdev->dev; + sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id); + /* set correct codec name */ + strcpy((char *)card->dai_link[2].codec_name, codec_name); + snd_soc_card_set_drvdata(card, drv); + ret_val = devm_snd_soc_register_card(&pdev->dev, card); if (ret_val) { dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret_val); return ret_val; } - platform_set_drvdata(pdev, &snd_soc_card_cht); + platform_set_drvdata(pdev, card); return ret_val; } static struct platform_driver snd_cht_mc_driver = { .driver = { .name = "cht-bsw-rt5645", - .pm = &snd_soc_pm_ops, }, .probe = snd_cht_mc_probe, }; -- 1.7.9.5

5 10

[alsa-devel] [PATCH 05/12] trivial: ASoC: adau1977: fix typo s/Substraction/Subtraction/
by Antonio Ospite 29 Apr '15

29 Apr '15

Signed-off-by: Antonio Ospite <ao2(a)ao2.it> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org --- sound/soc/codecs/adau1977.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index 7ad8e15..dc8ad08 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -202,7 +202,7 @@ static const struct snd_soc_dapm_route adau1977_dapm_routes[] = { ADAU1977_REG_DC_HPF_CAL, (x) - 1, 1, 0) #define ADAU1977_DC_SUB_SWITCH(x) \ - SOC_SINGLE("ADC" #x " DC Substraction Capture Switch", \ + SOC_SINGLE("ADC" #x " DC Subtraction Capture Switch", \ ADAU1977_REG_DC_HPF_CAL, (x) + 3, 1, 0) static const struct snd_kcontrol_new adau1977_snd_controls[] = { -- 2.1.4

3 4

[alsa-devel] Emu10k2 - support for 32 bit DMA mode
by Peter Zubaj 29 Apr '15

29 Apr '15

Hi, Looks like audigy emu10k2 (probably emu10k1 - sb live too) support two modes for DMA. Second mode is useful for 64 bit os with more then 2 GB of ram (fixes problems with big soundfont loading) 1) 32MB from 2 GB address space using 8192 pages (used now as default) 2) 16MB from 4 GB address space using 4096 pages Mode is set using HCFG_EXPANDED_MEM flag in HCFG register. Also format of emu10k2 page table is then different. If someone wants to play with it, attached is patch to enable this mode for audigy. It is tested only on audigy rx (8 GB ram, 64 bit os). Regards, Peter

2 3

Re: [alsa-devel] M-Audio Midisport 2x2 Anniversary edition, latency problem
by Clemens Ladisch 28 Apr '15

28 Apr '15

Ilya Dikariev wrote: > Вторник, 28 апреля 2015, 15:30 +02:00 от Clemens Ladisch <clemens(a)ladisch.de>: >> Ilya Dikariev wrote: >>> I bought a MIDI-interface von M-Audio (see subject), but there are >>> strange things with it on my desktop (Arch, latest kernel). The >>> latency is about 5 seconds. >> >> How are you measuring the latency? > > I measured it only with my feeling of time. What are the specific events between which there is an interval of 5 seconds? Regards, Clemens

1 0

[alsa-devel] [PATCH] ASoC: rt5645: fixed section mismatch
by Sudip Mukherjee 28 Apr '15

28 Apr '15

while building as a module we are getting warning about section mismatch. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 14570b3..0ed79ca 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2684,7 +2684,7 @@ static int strago_quirk_cb(const struct dmi_system_id *id) return 1; } -static struct dmi_system_id dmi_platform_intel_braswell[] __initdata = { +static struct dmi_system_id dmi_platform_intel_braswell[] = { { .ident = "Intel Strago", .callback = strago_quirk_cb, -- 1.8.1.2

2 1

[alsa-devel] [PATCH] ALSA: emux: Fix mutex deadlock in OSS emulation
by Takashi Iwai 28 Apr '15

28 Apr '15

The OSS emulation in synth-emux helper has a potential AB/BA deadlock at the simultaneous closing and opening: close -> snd_seq_release() -> sne_seq_free_client() -> snd_seq_delete_all_ports(): takes client->ports_mutex -> port_delete() -> snd_emux_unuse(): takes emux->register_mutex open -> snd_seq_oss_open() -> snd_emux_open_seq_oss(): takes emux->register_mutex -> snd_seq_event_port_attach() -> snd_seq_create_port(): takes client->ports_mutex This patch addresses the deadlock by reducing the rance taking emux->register_mutex in snd_emux_open_seq_oss(). The lock is needed for the refcount handling, so move it locally. The calls in emux_seq.c are already with the mutex, thus they are replaced with the version without mutex lock/unlock. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/synth/emux/emux_oss.c | 11 +---------- sound/synth/emux/emux_seq.c | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c index ab37add269ae..82e350e9501c 100644 --- a/sound/synth/emux/emux_oss.c +++ b/sound/synth/emux/emux_oss.c @@ -118,12 +118,8 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) if (snd_BUG_ON(!arg || !emu)) return -ENXIO; - mutex_lock(&emu->register_mutex); - - if (!snd_emux_inc_count(emu)) { - mutex_unlock(&emu->register_mutex); + if (!snd_emux_inc_count(emu)) return -EFAULT; - } memset(&callback, 0, sizeof(callback)); callback.owner = THIS_MODULE; @@ -135,7 +131,6 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) if (p == NULL) { snd_printk(KERN_ERR "can't create port\n"); snd_emux_dec_count(emu); - mutex_unlock(&emu->register_mutex); return -ENOMEM; } @@ -148,8 +143,6 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure) reset_port_mode(p, arg->seq_mode); snd_emux_reset_port(p); - - mutex_unlock(&emu->register_mutex); return 0; } @@ -195,13 +188,11 @@ snd_emux_close_seq_oss(struct snd_seq_oss_arg *arg) if (snd_BUG_ON(!emu)) return -ENXIO; - mutex_lock(&emu->register_mutex); snd_emux_sounds_off_all(p); snd_soundfont_close_check(emu->sflist, SF_CLIENT_NO(p->chset.port)); snd_seq_event_port_detach(p->chset.client, p->chset.port); snd_emux_dec_count(emu); - mutex_unlock(&emu->register_mutex); return 0; } diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index 188fda0effb0..a0209204ae48 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -267,8 +267,8 @@ snd_emux_event_input(struct snd_seq_event *ev, int direct, void *private_data, /* * increment usage count */ -int -snd_emux_inc_count(struct snd_emux *emu) +static int +__snd_emux_inc_count(struct snd_emux *emu) { emu->used++; if (!try_module_get(emu->ops.owner)) @@ -282,12 +282,21 @@ snd_emux_inc_count(struct snd_emux *emu) return 1; } +int snd_emux_inc_count(struct snd_emux *emu) +{ + int ret; + + mutex_lock(&emu->register_mutex); + ret = __snd_emux_inc_count(emu); + mutex_unlock(&emu->register_mutex); + return ret; +} /* * decrease usage count */ -void -snd_emux_dec_count(struct snd_emux *emu) +static void +__snd_emux_dec_count(struct snd_emux *emu) { module_put(emu->card->module); emu->used--; @@ -296,6 +305,12 @@ snd_emux_dec_count(struct snd_emux *emu) module_put(emu->ops.owner); } +void snd_emux_dec_count(struct snd_emux *emu) +{ + mutex_lock(&emu->register_mutex); + __snd_emux_dec_count(emu); + mutex_unlock(&emu->register_mutex); +} /* * Routine that is called upon a first use of a particular port @@ -315,7 +330,7 @@ snd_emux_use(void *private_data, struct snd_seq_port_subscribe *info) mutex_lock(&emu->register_mutex); snd_emux_init_port(p); - snd_emux_inc_count(emu); + __snd_emux_inc_count(emu); mutex_unlock(&emu->register_mutex); return 0; } @@ -338,7 +353,7 @@ snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *info) mutex_lock(&emu->register_mutex); snd_emux_sounds_off_all(p); - snd_emux_dec_count(emu); + __snd_emux_dec_count(emu); mutex_unlock(&emu->register_mutex); return 0; } -- 2.3.5

1 0

[alsa-devel] [PATCH V2] Update email-id of author
by Rajeev Kumar 28 Apr '15

28 Apr '15

rajeev-dlh.kumar(a)st.com email-id doesn't exist anymore as I have left the company. Replace ST's id with Rajeev Kumar <rajeevkumar.linux(a)gmail.com> Signed-off-by: Rajeev Kumar <rajeevkumar.linux(a)gmail.com> --- include/sound/designware_i2s.h | 2 +- include/sound/spear_dma.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h index 26f406e..3a8fca9 100644 --- a/include/sound/designware_i2s.h +++ b/include/sound/designware_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) + * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h index 65aca51..e290de4 100644 --- a/include/sound/spear_dma.h +++ b/include/sound/spear_dma.h @@ -1,7 +1,7 @@ /* * linux/spear_dma.h * -* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) +* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 -- 1.7.9.5

2 1

[alsa-devel] [RFC PATCH 1/2] ALSA: hda - divide controller and codec dependency on i915 gfx power well
by mengdong.lin＠intel.com 28 Apr '15

28 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch can improve power saving for Intel platforms on which only the display audio codec is in the shared i915 power well: - divide the controller and codec dependency on i915 power well by adding flag "need_i915_power" for the chip (controller) and codec respectively. - If the controller does not need the power well, the driver will release the power after probe. And if only the codec needs the power, its runtime PM ops will request/release the power. Background: - For Haswell/Broadwell, which has a separate HD-A controller for display audio, both the controller and the display codec are in the i915 power well. - For Baytrail/Braswell, the display and analog audio share the same HDA controller and link, and only the display codec is in the i915 power well. - For Skylake, the display and analog audio share the same HDA controller but use separate links. Only the display codec is in the i915 power well. And in legacy mode we take the two links as one. So it can follow Baytrail/Braswell. Open questions: - Move the hda_i915 to sound/hda at first? So both legacy and new drivers can use it as Takashi suggested? The PCI ID check in haswell_set_bclk will no longer be needed, since it's only called when chip's "need_i915_power" flag is set and so only called for Haswell & Broadwell. - move flag "need_i915_power" from struct hda_codec to hdac_device, for the same reason as above? - If the audio component moves from struct hda_intel to hdac_bus, how can the controller access the component? Need to add "bus" to struct azx? - implement codec resume/suspend ops to get/put i915 power if only the codec needs the power? Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 2a8aa9d..baa01a0 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -169,6 +169,8 @@ struct hdac_bus_ops { /* get a response from the last command */ int (*get_response)(struct hdac_bus *bus, unsigned int addr, unsigned int *res); + /* request/release display power */ + int (*display_power)(struct hdac_bus *bus, bool enable); }; #define HDA_UNSOL_QUEUE_SIZE 64 @@ -222,6 +224,11 @@ static inline void snd_hdac_codec_link_down(struct hdac_device *codec) clear_bit(codec->addr, &codec->bus->codec_powered); } +static inline int snd_hdac_display_power(struct hdac_device *codec, bool enable) +{ + return codec->bus->ops->display_power(codec->bus, enable); +} + /* * generic array helpers */ diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c old mode 100755 new mode 100644 index 18a021a..034488e --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -524,9 +524,21 @@ static int _hda_bus_get_response(struct hdac_bus *_bus, unsigned int addr, return bus->rirb_error ? -EIO : 0; } +static int _hda_bus_display_power(struct hdac_bus *_bus, bool enable) +{ + struct hda_bus *bus = container_of(_bus, struct hda_bus, core); + + if (bus->ops.display_power) + return bus->ops.display_power(bus, enable); + else + return -EINVAL; + +} + static const struct hdac_bus_ops bus_ops = { .command = _hda_bus_command, .get_response = _hda_bus_get_response, + .display_power = _hda_bus_display_power, }; /** @@ -949,6 +961,10 @@ void snd_hda_codec_register(struct hda_codec *codec) return; if (device_is_registered(hda_codec_dev(codec))) { snd_hda_register_beep_device(codec); + + if (codec->need_i915_power) + snd_hdac_display_power(&codec->core, true); + pm_runtime_enable(hda_codec_dev(codec)); /* it was powered up in snd_hda_codec_new(), now all done */ snd_hda_power_down(codec); @@ -3196,6 +3212,9 @@ static int hda_codec_runtime_suspend(struct device *dev) if (codec_has_clkstop(codec) && codec_has_epss(codec) && (state & AC_PWRST_CLK_STOP_OK)) snd_hdac_codec_link_down(&codec->core); + + if (codec->need_i915_power) + snd_hdac_display_power(&codec->core, false); return 0; } @@ -3205,6 +3224,9 @@ static int hda_codec_runtime_resume(struct device *dev) printk("amanda: hda_codec_runtime_resume, codec addr %d \n", codec->addr); + if (codec->need_i915_power) + snd_hdac_display_power(&codec->core, true); + snd_hdac_codec_link_up(&codec->core); hda_call_codec_resume(codec); pm_runtime_mark_last_busy(dev); diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 9075ac2..32d7fa7 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -64,6 +64,7 @@ struct hda_bus_ops { void (*load_dsp_cleanup)(struct hda_bus *bus, struct snd_dma_buffer *dmab); #endif + int (*display_power)(struct hda_bus *bus, bool enable); }; /* @@ -281,6 +282,7 @@ struct hda_codec { unsigned int dp_mst:1; /* support DP1.2 Multi-stream transport */ unsigned int dump_coef:1; /* dump processing coefs in codec proc file */ unsigned int power_save_node:1; /* advanced PM for each widget */ + unsigned int need_i915_power:1; /* only codec needs i915 power */ #ifdef CONFIG_PM unsigned long power_on_acct; unsigned long power_off_acct; diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 26ce990..b7eaf2d 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1354,6 +1354,17 @@ static unsigned int azx_get_response(struct hda_bus *bus, return azx_rirb_get_response(bus, addr); } + +static unsigned int azx_display_power(struct hda_bus *bus, bool enable) +{ + struct azx *chip = bus->private_data; + + if (chip->ops->display_power) + return chip->ops->display_power(chip, enable); + else + return -EINVAL; +} + #ifdef CONFIG_SND_HDA_DSP_LOADER /* * DSP loading code (e.g. for CA0132) @@ -1819,6 +1830,7 @@ static struct hda_bus_ops bus_ops = { .load_dsp_trigger = azx_load_dsp_trigger, .load_dsp_cleanup = azx_load_dsp_cleanup, #endif + .display_power = azx_display_power, }; /* HD-audio bus initialization */ diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index be1b7de..2d6c6c2 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -277,6 +277,7 @@ struct hda_controller_ops { struct vm_area_struct *area); /* Check if current position is acceptable */ int (*position_check)(struct azx *chip, struct azx_dev *azx_dev); + int (*display_power)(struct azx *chip, bool enable); }; struct azx_pcm { @@ -358,6 +359,7 @@ struct azx { unsigned int align_buffer_size:1; unsigned int region_requested:1; unsigned int disabled:1; /* disabled by VGA-switcher */ + unsigned int need_i915_power:1; /* both controller & display codec needs i915 power */ /* for debugging */ unsigned int last_cmd[AZX_MAX_CODECS]; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 34040d2..f6c3e37 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -543,6 +543,13 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev) return 0; } +static int azx_intel_display_power(struct azx *chip, bool enable) +{ + struct hda_intel *hda = container_of(chip, struct hda_intel, chip); + + return hda_display_power(hda, enable); +} + /* * Check whether the current DMA position is acceptable for updating * periods. Returns non-zero if it's OK. @@ -796,7 +803,8 @@ static int azx_suspend(struct device *dev) if (chip->msi) pci_disable_msi(chip->pci); - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) + if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL + && chip->need_i915_power) hda_display_power(hda, false); return 0; } @@ -816,7 +824,8 @@ static int azx_resume(struct device *dev) if (chip->disabled || hda->init_failed) return 0; - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { + if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL + && chip->need_i915_power) { hda_display_power(hda, true); haswell_set_bclk(hda); } @@ -859,7 +868,8 @@ static int azx_runtime_suspend(struct device *dev) azx_stop_chip(chip); azx_enter_link_reset(chip); azx_clear_irq_pending(chip); - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) + if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL + && chip->need_i915_power) hda_display_power(hda, false); return 0; @@ -885,7 +895,8 @@ static int azx_runtime_resume(struct device *dev) if (!azx_has_pm_runtime(chip)) return 0; - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { + if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL + && chip->need_i915_power) { hda_display_power(hda, true); haswell_set_bclk(hda); } @@ -1105,7 +1116,8 @@ static int azx_free(struct azx *chip) release_firmware(chip->fw); #endif if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { - hda_display_power(hda, false); + if (chip->need_i915_power) + hda_display_power(hda, false); hda_i915_exit(hda); } kfree(hda); @@ -1757,6 +1769,7 @@ static const struct hda_controller_ops pci_hda_ops = { .substream_free_pages = substream_free_pages, .pcm_mmap_prepare = pcm_mmap_prepare, .position_check = azx_position_check, + .display_power = azx_intel_display_power, }; static int azx_probe(struct pci_dev *pci, @@ -1855,12 +1868,12 @@ static int azx_probe_continue(struct azx *chip) #ifdef CONFIG_SND_HDA_I915 err = hda_i915_init(hda); if (err < 0) - goto out_free; + goto i915_power_fail; err = hda_display_power(hda, true); if (err < 0) { dev_err(chip->card->dev, "Cannot turn on display power on i915\n"); - goto out_free; + goto i915_power_fail; } #endif } @@ -1911,6 +1924,10 @@ static int azx_probe_continue(struct azx *chip) pm_runtime_put_noidle(&pci->dev); out_free: + if (!chip->need_i915_power) + hda_display_power(hda, false); + +i915_power_fail: if (err < 0) hda->init_failed = 1; complete_all(&hda->probe_wait); -- 1.9.1

3 10

[alsa-devel] Audio crackles with 4.1-rc1
by Jonathan McDowell 28 Apr '15

28 Apr '15

Having upgraded to 4.1-rc1 from 4.0 I'm now hearing audio crackles at regular intervals. I'm fairly sure this is due to the HDA power save as once audio is playing things are fine, it's just when starting to play audio that I hear the crackle. System is a Dell Latitude E7240. I haven't tried a bisect yet but will attempt to find some time to do so in the next few days. It looks like there have been some changes in sound/hda/ between 4.0 + 4.1-rc1 so I'll concentrate on those first. Hopefully relevant dmesg output for the device: [ 23.551075] snd_hda_intel 0000:00:03.0: enabling device (0000 -> 0002) [ 23.551279] snd_hda_intel 0000:00:03.0: bound 0000:00:02.0 (ops 0xffffffff81891a00) [ 23.575852] snd_hda_codec_realtek hdaudioC1D0: autoconfig for ALC3226: line_outs=1 (0x16/0x0/0x0/0x0/0x0) type:line [ 23.575855] snd_hda_codec_realtek hdaudioC1D0: speaker_outs=1 (0x14/0x0/0x0/0x0/0x0) [ 23.575857] snd_hda_codec_realtek hdaudioC1D0: hp_outs=1 (0x15/0x0/0x0/0x0/0x0) [ 23.575858] snd_hda_codec_realtek hdaudioC1D0: mono: mono_out=0x0 [ 23.575859] snd_hda_codec_realtek hdaudioC1D0: inputs: [ 23.575861] snd_hda_codec_realtek hdaudioC1D0: Dock Mic=0x19 [ 23.575863] snd_hda_codec_realtek hdaudioC1D0: Headset Mic=0x1a [ 23.575870] snd_hda_codec_realtek hdaudioC1D0: Internal Mic=0x12 [ 23.582324] input: HDA Intel HDMI HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:03.0/sound/card0/input12 [ 23.582397] input: HDA Intel HDMI HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:03.0/sound/card0/input13 [ 23.582747] input: HDA Intel HDMI HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:03.0/sound/card0/input14 [ 23.593267] input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/sound/card1/input9 [ 23.594102] input: HDA Intel PCH Dock Mic as /devices/pci0000:00/0000:00:1b.0/sound/card1/input15 [ 23.594268] input: HDA Intel PCH Dock Line Out as /devices/pci0000:00/0000:00:1b.0/sound/card1/input16 [ 23.594346] input: HDA Intel PCH Front Headphone as /devices/pci0000:00/0000:00:1b.0/sound/card1/input17 I have: CONFIG_SND_HDA_POWER_SAVE_DEFAULT=600 set in my kernel config. There's no dmesg output around the times when the crackling is occurring. J. -- Friends are God's apology for relations.

2 4

[alsa-devel] M-Audio Midisport 2x2 Anniversary edition, latency problem
by Ilya Dikariev 28 Apr '15

28 Apr '15

Hi all, I bought a MIDI-interface von M-Audio (see subject), but there are strange things with it on my desktop (Arch, latest kernel). The latency is about 5 seconds. If I reconnect cabels, the latency can change from 5 sec to 0.5 sec, or to ~0sec, but in 90% of all the tries, the latency stay at 3-5 sec. I tried it on my older laptop (kernel 2.6.32 from Ubuntu 10.04) and it works! I think it's a regression. How can I help to fix this bug? best regards, Ilya.

2 1

[alsa-devel] [PATCH] conf/ucm: broadwell-rt286: change to use the correct jack kcontrol name
by Jie Yang 28 Apr '15

28 Apr '15

The headset jack has two kctls: "Headphone Jack" and "Mic Jack", we need switch speaker output according to the former JackControl. Here correct it. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- src/conf/ucm/broadwell-rt286/HiFi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/ucm/broadwell-rt286/HiFi b/src/conf/ucm/broadwell-rt286/HiFi index 08f5c50..58983ea 100644 --- a/src/conf/ucm/broadwell-rt286/HiFi +++ b/src/conf/ucm/broadwell-rt286/HiFi @@ -43,7 +43,7 @@ SectionDevice."Headphones" { Value { PlaybackChannels "2" JackDev "rt286-jack" - JackControl "Headset Jack" + JackControl "Headphone Jack" JackHWMute "Speaker" } } -- 1.9.1

2 1

[alsa-devel] [PATCH 03/12] trivial: ASoC: pxa: pxa-ssp.c: indent with TABs, not spaces
by Antonio Ospite 28 Apr '15

28 Apr '15

Signed-off-by: Antonio Ospite <ao2(a)ao2.it> Cc: Daniel Mack <daniel(a)zonque.org> Cc: Mark Brown <broonie(a)kernel.com> Cc: alsa-devel(a)alsa-project.org --- sound/soc/pxa/pxa-ssp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index fbe2e93..eb181ab 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -586,7 +586,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, switch (priv->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - sspsp = pxa_ssp_read_reg(ssp, SSPSP); + sspsp = pxa_ssp_read_reg(ssp, SSPSP); if ((pxa_ssp_get_scr(ssp) == 4) && (width == 16)) { /* This is a special case where the bitclk is 64fs -- 2.1.4

1 0

[alsa-devel] [PATCH v10 0/9] ASoC: tda998x: add a codec to the HDMI transmitter
by Jean-Francois Moine 28 Apr '15

28 Apr '15

Based on broonie/ASoC v10: - add the generic dt-card - define the audio ports from a DT graph of ports (Russell King) - reuse HDMI constants (Andrew Jackson - Jyri Sarha) - alloc rate_constraints in codec (Jyri Sarha) - fix bad number of channels (Jyri Sarha) - correct codec generation from config (Russell King - Jyri Sarha) - no module init/exit (Russell King) v9: - back to a TDA998x specific CODEC - more comments - change magic values to constants v8: - change some comments about the patches v7: - remove the change of the K predivider (Jyri Sarha) - add S24_3LE and S32_LE as possible audio formats (Jyri Sarha) - don't move the struct priv2 definition and use the slave encoder private data as the device private data (Russell King) - remove the useless request_module (Russell King/Mark Brown) - don't lock the HDMI module (Russell King) - use platform_device_unregister to remove the codec (Russell King) v6: - extend the HDMI CODEC instead of using a specific CODEC v5: - use the TDA998x private data instead of a specific area for the CODEC interface - the CODEC is TDA998x specific (Mark Brown) v4: - remove all the TDA998x specific stuff from the CODEC - move the EDID scan from the CODEC to the TDA998x - move the CODEC to sound/soc (Mark Brown) - update the audio_sample_rate from the EDID (Andrew Jackson) v3: fix bad rate (Andrew Jackson) v2: check double stream start (Mark Brown) Jean-Francois Moine (9): ASoC: kirkwood: dynamically build the DAI array ASoC: kirkwood: check the DAI type from the DAI name ASoC: kirkwood: accept the DAI definitions from a graph of ports drm/i2c: tda998x: Add support of a DT graph of ports drm/i2c: tda998x: Change drvdata for audio extension ASoC: tda998x: add a codec to the HDMI transmitter drm/i2c: tda998x: set cts_n according to the sample width ASoC: core: export snd_soc_get_dai_name ASoC: add generic dt-card support .../devicetree/bindings/drm/i2c/tda998x.txt | 51 ++++ .../devicetree/bindings/sound/mvebu-audio.txt | 30 +++ drivers/gpu/drm/i2c/tda998x_drv.c | 237 +++++++++++++++++- include/sound/soc.h | 2 + include/sound/tda998x.h | 32 +++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tda998x.c | 175 +++++++++++++ sound/soc/generic/Kconfig | 2 + sound/soc/generic/Makefile | 2 + sound/soc/generic/dt-card.c | 275 +++++++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 141 ++++++----- sound/soc/kirkwood/kirkwood.h | 4 +- sound/soc/soc-core.c | 5 +- 14 files changed, 877 insertions(+), 86 deletions(-) create mode 100644 include/sound/tda998x.h create mode 100644 sound/soc/codecs/tda998x.c create mode 100644 sound/soc/generic/dt-card.c -- 2.1.4

3 13

[alsa-devel] [PATCH v10 0/7] ALSA: jack: Refactoring for jack kctls
by Jie Yang 28 Apr '15

28 Apr '15

This patch series aligns jack handling between the HDA and ASoC subsystems. The HDA subsystem currently creates a kcontrol for each HDA jack registered. ASoC subsystem creates input device jacks for each jack registered. This series aligns both jack APIs to create kcontrol jacks. This implementation keeps compatibility with existing HDA jacks so no userspace changes are required. Changes in v10: 1. rebase it on top of tiwai/sound.git for-linus branch; 2. Liam helps fix some typos and syntax errors in comments and descriptions. Changes in v9: 1. move struct snd_jack_kctl definition to jack.c, to hides the internal implementation details; 2. some small code fixing; 3. update documentation file. Changes in v8: 1. remove snd_jack_kctl from HDA part, change snd_jack_new param to use bool for creating kcontrol at jack creating stage; 2. create jack for phantom jack, with no input device; 3. remove HDA jack get_unique_index() and index related code. Changes in v7: 1. move name generating and index getting part into ctljack.c; 2. remove exposing private_data and destructor to HDA, then jack core can handle kctls by itself totally. 3. some small code fixing. Changes in v6: 1. refine kctl name generating function; 2. integrate HDA jack kctl more deeply, support phantom jack in snd_jack_new(); 3. add documentation for Jack kcontrols to explain how to use it. Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. Jie Yang (7): ALSA: jack: implement kctl creating for jack devices ALSA: Jack: handle jack embedded kcontrol creating within ctljack ALSA: jack: extend snd_jack_new to support phantom jack ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove exporting ctljack functions ALSA: Docs: Add documentation for Jack kcontrols Documentation/sound/alsa/Jack-Controls.txt | 43 ++++++++++ include/sound/control.h | 2 +- include/sound/jack.h | 13 ++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 41 +++++++-- sound/core/jack.c | 133 ++++++++++++++++++++++++++--- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/hda_jack.c | 90 ++++++------------- sound/pci/hda/hda_jack.h | 5 +- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 13 files changed, 242 insertions(+), 100 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt -- 1.9.1

2 8

[alsa-devel] [PATCH] ASoC: rt5645: fixed kbuild err
by yang.a.fang＠intel.com 28 Apr '15

28 Apr '15

From: "Fang, Yang A" <yang.a.fang(a)intel.com> kbuild robot reports following error/warnings sound/soc/codecs/rt5645.c: In function 'rt5645_i2c_probe': >> sound/soc/codecs/rt5645.c:2720:4: error: implicit declaration of >> function 'devm_gpiod_get_index' >> [-Werror=implicit-function-declaration] gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); ^ >> sound/soc/codecs/rt5645.c:2720:10: warning: assignment makes pointer >> from integer without a cast gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0); ^ >> sound/soc/codecs/rt5645.c:2722:4: error: implicit declaration of >> function 'gpiod_direction_input' >> [-Werror=implicit-function-declaration] if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) { ^ >> sound/soc/codecs/rt5645.c:2726:5: error: implicit declaration of >> function 'desc_to_gpio' [-Werror=implicit-function-declaration] rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod); ^ >> sound/soc/codecs/rt5645.c:2728:7: error: implicit declaration of >> function 'gpiod_is_active_low' >> [-Werror=implicit-function-declaration] = !gpiod_is_active_low(gpiod); ^ cc1: some warnings being treated as errors Signed-off-by: Fang, Yang A <yang.a.fang(a)intel.com> --- sound/soc/codecs/rt5645.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index fb561b4..2cab2eb 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/acpi.h> #include <linux/dmi.h> #include <sound/core.h> -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] ASoC: rt5645: Add ACPI match ID
by yang.a.fang＠intel.com 27 Apr '15

27 Apr '15

From: "Fang, Yang A" <yang.a.fang(a)intel.com> This patch adds the ACPI match ID for rt5645/5650 codec Signed-off-by: Fang, Yang A <yang.a.fang(a)intel.com> --- sound/soc/codecs/rt5645.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index c9a4c5b..e16724a 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/gpio.h> +#include <linux/acpi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -2618,6 +2619,15 @@ static const struct i2c_device_id rt5645_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id); +#ifdef CONFIG_ACPI +static struct acpi_device_id rt5645_acpi_match[] = { + { "10EC5645", 0 }, + { "10EC5650", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); +#endif + static int rt5645_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -2834,6 +2844,7 @@ static struct i2c_driver rt5645_i2c_driver = { .driver = { .name = "rt5645", .owner = THIS_MODULE, + .acpi_match_table = ACPI_PTR(rt5645_acpi_match), }, .probe = rt5645_i2c_probe, .remove = rt5645_i2c_remove, -- 1.7.9.5

2 5

[alsa-devel] [PATCH v2] ASoC: rt5645: Adds push button support for rt5650
by bardliao＠realtek.com 27 Apr '15

27 Apr '15

From: Bard Liao <bardliao(a)realtek.com> rt5650 support headset button detection. Currently, the button detection is only implemented for rt5650 codec. The button detection configuration register's default value is different from rt5645. And we didn't touch the register in the driver, so we will get the wrong value when we dump the registers. We will fix it in another patch. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- * remove the change of removing the value of 0xdd in rt5645_reg[]. * add comment of handle three button detection code in one case. Mark, Can we have a separate codec driver for rt5650? rt5650 will be more popular than rt5645. Many customers are searching rt5650.c but can't find one. We have to told them rt5650 and rt5645 share the same codec driver. Also, some registers or functions are different between rt5645 and rt5650. Thanks. --- sound/soc/codecs/rt5645.c | 266 +++++++++++++++++++++++++++++++++------ sound/soc/codecs/rt5645.h | 8 +- sound/soc/intel/cht_bsw_rt5645.c | 2 +- 3 files changed, 237 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 69528ae..2d80568 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2368,6 +2368,8 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5645_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + switch (level) { case SND_SOC_BIAS_PREPARE: if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { @@ -2398,8 +2400,9 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100); - snd_soc_update_bits(codec, RT5645_GEN_CTRL1, - RT5645_DIG_GATE_CTRL, 0); + if (!rt5645->en_button_func) + snd_soc_update_bits(codec, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, 0); snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2 | @@ -2414,28 +2417,71 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int rt5645_jack_detect(struct snd_soc_codec *codec) +static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec, + bool enable) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); - int gpio_state, jack_type = 0; - unsigned int val; - if (!gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - dev_err(codec->dev, "invalid gpio\n"); - return -EINVAL; + if (enable) { + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC R power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); + snd_soc_update_bits(codec, + RT5645_INT_IRQ_ST, 0x8, 0x8); + snd_soc_update_bits(codec, + RT5650_4BTN_IL_CMD2, 0x8000, 0x8000); + snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, + snd_soc_read(codec, RT5650_4BTN_IL_CMD1)); + } else { + snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0); + snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC R power"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); } - gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); +} - dev_dbg(codec->dev, "gpio = %d(%d)\n", rt5645->pdata.hp_det_gpio, - gpio_state); +static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + unsigned int val; - if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || - (!rt5645->pdata.gpio_hp_det_active_high && !gpio_state)) { - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (jack_insert) { + if (codec->component.card->instantiated) { + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias1"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + /* Power up necessary bits for JD if dapm is + not ready yet */ + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, + RT5645_PWR_MB1 | RT5645_PWR_MB2); + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, RT5645_PWR_LDO2); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, RT5645_PWR_MIC_DET); + } snd_soc_write(codec, RT5645_IN1_CTRL1, 0x0006); snd_soc_write(codec, RT5645_JD_CTRL3, 0x00b0); @@ -2449,32 +2495,62 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec) val = snd_soc_read(codec, RT5645_IN1_CTRL3) & 0x7; dev_dbg(codec->dev, "val = %d\n", val); - if (val == 1 || val == 2) - jack_type = SND_JACK_HEADSET; - else - jack_type = SND_JACK_HEADPHONE; + if (codec->component.card->instantiated) { + snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); + snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); + snd_soc_dapm_disable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, 0); + if (rt5645->pdata.jd_mode == 0) + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, 0); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, 0); + } - snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); - if (rt5645->pdata.jd_mode == 0) - snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (val == 1 || val == 2) { + rt5645->jack_type = SND_JACK_HEADSET; + if (rt5645->en_button_func) { + msleep(100); + rt5645_enable_push_button_irq(codec, true); + } + } else { + rt5645->jack_type = SND_JACK_HEADPHONE; + } + + } else { /* jack out */ + rt5645->jack_type = 0; + if (rt5645->en_button_func) + rt5645_enable_push_button_irq(codec, false); } - snd_soc_jack_report(rt5645->hp_jack, jack_type, SND_JACK_HEADPHONE); - snd_soc_jack_report(rt5645->mic_jack, jack_type, SND_JACK_MICROPHONE); - return 0; + return rt5645->jack_type; } int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack) + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); rt5645->hp_jack = hp_jack; rt5645->mic_jack = mic_jack; - rt5645_jack_detect(codec); + rt5645->btn_jack = btn_jack; + if (rt5645->btn_jack && rt5645->codec_type == CODEC_TYPE_RT5650) { + rt5645->en_button_func = true; + regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, + RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ); + regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1, + RT5645_HP_CB_MASK, RT5645_HP_CB_PU); + regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); + } + rt5645_irq_detection(rt5645); return 0; } @@ -2485,7 +2561,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) struct rt5645_priv *rt5645 = container_of(work, struct rt5645_priv, jack_detect_work.work); - rt5645_jack_detect(rt5645->codec); + rt5645_irq_detection(rt5645); } static irqreturn_t rt5645_irq(int irq, void *data) @@ -2498,6 +2574,125 @@ static irqreturn_t rt5645_irq(int irq, void *data) return IRQ_HANDLED; } +static int rt5645_button_detect(struct snd_soc_codec *codec) +{ + int btn_type, val; + + val = snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("val=0x%x\n", val); + btn_type = val & 0xfff0; + snd_soc_write(codec, RT5650_4BTN_IL_CMD1, val); + + return btn_type; +} + +static int rt5645_irq_detection(struct rt5645_priv *rt5645) +{ + int val, btn_type, gpio_state = 0, report = 0; + + switch (rt5645->pdata.jd_mode) { + case 0: /* Not using rt5645 JD */ + if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { + gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); + dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n", + rt5645->pdata.hp_det_gpio, gpio_state); + } + if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || + (!rt5645->pdata.gpio_hp_det_active_high && + !gpio_state)) { + report = rt5645_jack_detect(rt5645->codec, 1); + } else { + report = rt5645_jack_detect(rt5645->codec, 0); + } + snd_soc_jack_report(rt5645->hp_jack, + report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, + report, SND_JACK_MICROPHONE); + return report; + case 1: /* 2 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0070; + break; + default: /* 1 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0020; + break; + + } + + switch (val) { + /* jack in */ + case 0x30: /* 2 port */ + case 0x0: /* 1 port or 2 port */ + if (rt5645->jack_type == 0) { + report = rt5645_jack_detect(rt5645->codec, 1); + /* for push button and jack out */ + break; + } + btn_type = 0; + if (snd_soc_read(rt5645->codec, RT5645_INT_IRQ_ST) & 0x4) { + /* button pressed */ + report = SND_JACK_HEADSET; + btn_type = rt5645_button_detect(rt5645->codec); + /* rt5650 can report three kinds of button behavior, + one click, double click and hold. However, + currently we will report button pressed/released + event. So all the three button behaviors are + treated as button pressed. */ + switch (btn_type) { + case 0x8000: + case 0x4000: + case 0x2000: + report |= SND_JACK_BTN_0; + break; + case 0x1000: + case 0x0800: + case 0x0400: + report |= SND_JACK_BTN_1; + break; + case 0x0200: + case 0x0100: + case 0x0080: + report |= SND_JACK_BTN_2; + break; + case 0x0040: + case 0x0020: + case 0x0010: + report |= SND_JACK_BTN_3; + break; + case 0x0000: /* unpressed */ + break; + default: + dev_err(rt5645->codec->dev, + "Unexpected button code 0x%04x\n", + btn_type); + break; + } + } + if (btn_type == 0)/* button release */ + report = rt5645->jack_type; + + break; + /* jack out */ + case 0x70: /* 2 port */ + case 0x10: /* 2 port */ + case 0x20: /* 1 port */ + report = 0; + snd_soc_update_bits(rt5645->codec, + RT5645_INT_IRQ_ST, 0x1, 0x0); + rt5645_jack_detect(rt5645->codec, 0); + break; + default: + break; + } + + snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); + if (rt5645->en_button_func) + snd_soc_jack_report(rt5645->btn_jack, + report, SND_JACK_MICROPHONE); + + return report; +} + static int rt5645_probe(struct snd_soc_codec *codec) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); @@ -2784,8 +2979,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (rt5645->pdata.en_jd_func) { regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL3, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU); + RT5645_IRQ_CLK_GATE_CTRL, RT5645_IRQ_CLK_GATE_CTRL); regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, RT5645_CBJ_BST1_EN, RT5645_CBJ_BST1_EN); regmap_update_bits(rt5645->regmap, RT5645_JD_CTRL3, diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index db78e94..4473636 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2184,6 +2184,7 @@ struct rt5645_priv { struct i2c_client *i2c; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; + struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; int codec_type; @@ -2196,9 +2197,12 @@ struct rt5645_priv { int pll_src; int pll_in; int pll_out; + + int jack_type; + bool en_button_func; }; int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack); - + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack); #endif /* __RT5645_H__ */ diff --git a/sound/soc/intel/cht_bsw_rt5645.c b/sound/soc/intel/cht_bsw_rt5645.c index bd29617..3d0b549 100644 --- a/sound/soc/intel/cht_bsw_rt5645.c +++ b/sound/soc/intel/cht_bsw_rt5645.c @@ -185,7 +185,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack); + rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL); return ret; } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH 1/4] ASoC: Add helper function getting CODEC's DAPM context
by Lars-Peter Clausen 27 Apr '15

27 Apr '15

The DAPM context in the snd_soc_codec struct is redundant and scheduled to be replaced by the DAPM context in the snd_soc_component struct. This patch introduces a new helper function snd_soc_codec_get_dapm() which should be used for getting the DAPM context for a CODEC rather then directly accessing the dapm field. Once there are no more direct users of the dapm field left it is possible to transparently switch all drivers to the component DAPM context by updating snd_soc_codec_get_dapm() function. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/soc.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index f6226914..d57dc7c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -819,7 +819,7 @@ struct snd_soc_codec { /* component */ struct snd_soc_component component; - /* dapm */ + /* Don't access this directly, use snd_soc_codec_get_dapm() */ struct snd_soc_dapm_context dapm; #ifdef CONFIG_DEBUG_FS @@ -1282,6 +1282,18 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm( } /** + * snd_soc_codec_get_dapm() - Returns the DAPM context for the CODEC + * @codec: The CODEC for which to get the DAPM context + * + * Note: Use this function instead of directly accessing the CODEC's dapm field + */ +static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm( + struct snd_soc_codec *codec) +{ + return &codec->dapm; +} + +/** * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol * @kcontrol: The kcontrol * -- 1.8.0

2 4

[alsa-devel] [PATCH RFT] ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
by Axel Lin 27 Apr '15

27 Apr '15

Current code uses wrong mask when setting RT5645_DMIC_2_DP_GPIO12 bit, fix it. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Hi Bard, I don't have the h/w to test, so please review and test this patch. Thanks, Axel sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 69528ae..a249f65 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2770,7 +2770,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, case RT5645_DMIC_DATA_GPIO12: regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1, - RT5645_DMIC_1_DP_MASK, RT5645_DMIC_2_DP_GPIO12); + RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_GPIO12); regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, RT5645_GP12_PIN_MASK, RT5645_GP12_PIN_DMIC2_SDA); -- 2.1.0

2 1

[alsa-devel] [PATCH: RESEND] Update email-id of author
by Rajeev Kumar 27 Apr '15

27 Apr '15

rajeev-dlh.kumar(a)st.com email-id doesn't exist anymore as I have left the company. Replace ST's id with Rajeev Kumar <rajeevkumar.linux(a)gmail.com> It also updates .mailmap file to fix address for 'git shortlog' Signed-off-by: Rajeev Kumar <rajeevkumar.linux(a)gmail.com> --- .mailmap | 1 + arch/arm/mach-spear/generic.h | 2 +- arch/arm/mach-spear/include/mach/irqs.h | 2 +- arch/arm/mach-spear/include/mach/spear.h | 2 +- arch/arm/mach-spear/spear6xx.c | 2 +- drivers/input/keyboard/spear-keyboard.c | 2 +- drivers/rtc/rtc-spear.c | 4 ++-- include/linux/platform_data/keyboard-spear.h | 2 +- include/sound/designware_i2s.h | 2 +- include/sound/spear_dma.h | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index 0d971cf..c570755 100644 --- a/.mailmap +++ b/.mailmap @@ -96,6 +96,7 @@ Peter A Jonsson <pj(a)ludd.ltu.se> Peter Oruba <peter(a)oruba.de> Peter Oruba <peter.oruba(a)amd.com> Praveen BP <praveenbp(a)ti.com> +Rajeev Kumar <rajeevkumar.linux(a)gmail.com> Rajesh Shah <rajesh.shah(a)intel.com> Ralf Baechle <ralf(a)linux-mips.org> Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h index a99d90a..0bfd2ea 100644 --- a/arch/arm/mach-spear/generic.h +++ b/arch/arm/mach-spear/generic.h @@ -2,7 +2,7 @@ * spear machine family generic header file * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/irqs.h b/arch/arm/mach-spear/include/mach/irqs.h index 92da0a8..022cf98 100644 --- a/arch/arm/mach-spear/include/mach/irqs.h +++ b/arch/arm/mach-spear/include/mach/irqs.h @@ -2,7 +2,7 @@ * IRQ helper macros for spear machine family * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index f2d6a01..0d2f14d 100644 --- a/arch/arm/mach-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h @@ -2,7 +2,7 @@ * SPEAr3xx/6xx Machine family specific definition * * Copyright (C) 2009,2012 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index da26fa5b..c6dcb0d 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -4,7 +4,7 @@ * SPEAr6XX machines common source file * * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * Copyright 2012 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index f42a543..623d451 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -3,7 +3,7 @@ * Based on omap-keypad driver * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c index d2cdb98..d14be33 100644 --- a/drivers/rtc/rtc-spear.c +++ b/drivers/rtc/rtc-spear.c @@ -2,7 +2,7 @@ * drivers/rtc/rtc-spear.c * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -504,6 +504,6 @@ static struct platform_driver spear_rtc_driver = { module_platform_driver(spear_rtc_driver); MODULE_ALIAS("platform:rtc-spear"); -MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar(a)st.com>"); +MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux(a)gmail.com>"); MODULE_DESCRIPTION("ST SPEAr Realtime Clock Driver (RTC)"); MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h index 9248e3a..5e3ff65 100644 --- a/include/linux/platform_data/keyboard-spear.h +++ b/include/linux/platform_data/keyboard-spear.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h index 26f406e..3a8fca9 100644 --- a/include/sound/designware_i2s.h +++ b/include/sound/designware_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) + * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h index 65aca51..e290de4 100644 --- a/include/sound/spear_dma.h +++ b/include/sound/spear_dma.h @@ -1,7 +1,7 @@ /* * linux/spear_dma.h * -* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) +* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: dmaengine_pcm: Make FLAG_NO_RESIDUE internal
by Lars-Peter Clausen 27 Apr '15

27 Apr '15

Whether residue can be reported or not is not a property of the audio controller but of the DMA controller. The FLAG_NO_RESIDUE was initially added when the DMAengine framework had no support for describing the residue reporting capabilities of the controller. Support for this was added quite a while ago and recently the DMAengine framework started to complain if a driver does not describe its capabilities and a lot of patches have been merged that add support for this where it was missing. So it should be safe to assume that driver on actively used platforms properly implement the DMA capabilities API. This patch makes the FLAG_NO_RESIDUE internal and no longer allows audio controller drivers to manually set the flag. If a DMA driver against expectations does not support reporting its capabilities for now the generic DMAengine PCM driver will now emit a warning and simply assume that residue reporting is not supported. In the future this might be changed to aborting with an error. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/dmaengine_pcm.h | 5 ----- sound/soc/atmel/atmel-pcm-dma.c | 3 +-- sound/soc/cirrus/ep93xx-pcm.c | 1 - sound/soc/fsl/fsl_sai.c | 3 +-- sound/soc/soc-generic-dmaengine-pcm.c | 25 ++++++++++++++----------- sound/soc/ux500/ux500_pcm.c | 1 - 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index eb73a3a..f86ef5e 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -91,11 +91,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data( */ #define SND_DMAENGINE_PCM_FLAG_NO_DT BIT(1) /* - * The platforms dmaengine driver does not support reporting the amount of - * bytes that are still left to transfer. - */ -#define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(2) -/* * The PCM is half duplex and the DMA channel is shared between capture and * playback. */ diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index b6625c8..dd57a9e 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -124,8 +124,7 @@ static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = { int atmel_pcm_dma_platform_register(struct device *dev) { - return snd_dmaengine_pcm_register(dev, &atmel_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); + return snd_dmaengine_pcm_register(dev, &atmel_dmaengine_pcm_config, 0); } EXPORT_SYMBOL(atmel_pcm_dma_platform_register); diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c index 5f66447..67a7333 100644 --- a/sound/soc/cirrus/ep93xx-pcm.c +++ b/sound/soc/cirrus/ep93xx-pcm.c @@ -60,7 +60,6 @@ int devm_ep93xx_pcm_platform_register(struct device *dev) { return devm_snd_dmaengine_pcm_register(dev, &ep93xx_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | SND_DMAENGINE_PCM_FLAG_NO_DT | SND_DMAENGINE_PCM_FLAG_COMPAT); } diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index ec79c3d..ee2671b 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -664,8 +664,7 @@ static int fsl_sai_probe(struct platform_device *pdev) if (sai->sai_on_imx) return imx_pcm_dma_init(pdev); else - return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); + return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); } static const struct of_device_id fsl_sai_ids[] = { diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index c9917ca..6fd1906 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -24,6 +24,12 @@ #include <sound/dmaengine_pcm.h> +/* + * The platforms dmaengine driver does not support reporting the amount of + * bytes that are still left to transfer. + */ +#define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(31) + struct dmaengine_pcm { struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1]; const struct snd_dmaengine_pcm_config *config; @@ -222,14 +228,18 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( return snd_dmaengine_pcm_request_channel(fn, dma_data->filter_data); } -static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan) +static bool dmaengine_pcm_can_report_residue(struct device *dev, + struct dma_chan *chan) { struct dma_slave_caps dma_caps; int ret; ret = dma_get_slave_caps(chan, &dma_caps); - if (ret != 0) - return true; + if (ret != 0) { + dev_warn(dev, "Failed to get DMA channel capabilities, falling back to period counting: %d\n", + ret); + return false; + } if (dma_caps.residue_granularity == DMA_RESIDUE_GRANULARITY_DESCRIPTOR) return false; @@ -289,14 +299,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) if (ret) return ret; - /* - * This will only return false if we know for sure that at least - * one channel does not support residue reporting. If the DMA - * driver does not implement the slave_caps API we rely having - * the NO_RESIDUE flag set manually in case residue reporting is - * not supported. - */ - if (!dmaengine_pcm_can_report_residue(pcm->chan[i])) + if (!dmaengine_pcm_can_report_residue(dev, pcm->chan[i])) pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE; } diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 51a66a8..f12c01d 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -147,7 +147,6 @@ int ux500_pcm_register_platform(struct platform_device *pdev) pcm_config = &ux500_dmaengine_pcm_config; ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | SND_DMAENGINE_PCM_FLAG_COMPAT); if (ret < 0) { dev_err(&pdev->dev, -- 1.8.0

2 3

[alsa-devel] [PATCH v9 0/7] ALSA: jack: Refactoring for jack kctls
by Jie Yang 27 Apr '15

27 Apr '15

Currently only hda will create kctls for hda jacks, for asoc, people may need create jack kctls in specific driver. Here we are introducing kctls for each jack, by creating kctls and add them to jack controls list (considering exist of combo jack). At the same time, we will report events for each control in the list. With this new implementation, both HDA and soc jack kctls works fine, they are compatible for old HDA jack kctls, too. For soc, a. snd_jack_new() with NULL jack_kctl; b. for each pin, call snd_jack_add_kctls() to add one kctl(it will call snd_ctl_add() to add kctl to card); For HDA, With snd_jack_new(), we can use phantom_jack = true for phantom jack creating, and the jack kctl pointer will be filled with the new created kcontrol. Changes in v9: 1. move struct snd_jack_kctl definition to jack.c, to hides the internal implementation details; 2. some small code fixing; 3. update documentation file. Changes in v8: 1. remove snd_jack_kctl from HDA part, change snd_jack_new param to use bool for creating kcontrol at jack creating stage; 2. create jack for phantom jack, with no input device; 3. remove HDA jack get_unique_index() and index related code. Changes in v7: 1. move name generating and index getting part into ctljack.c; 2. remove exposing private_data and destructor to hda, then jack core can handle kctls by itself totally. 3. some small code fixing. Changes in v6: 1. refine kctl name generating function; 2. integrate HDA jack kctl more deeply, support phantom jack in snd_jack_new(); 3. add documentation for Jack kcontrols to explain how to use it. Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. Jie Yang (7): ALSA: jack: implement kctl creating for jack device ALSA: Jack: handle jack embedded kcontrol creating within ctljack ALSA: jack: extend snd_jack_new to support phantom jack ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove exporting ctljack functions ALSA: Docs: Add documentation for Jack kcontrols Documentation/sound/alsa/Jack-Controls.txt | 49 ++++++++++ include/sound/control.h | 2 +- include/sound/jack.h | 13 ++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 41 ++++++-- sound/core/jack.c | 152 ++++++++++++++++++++++++++--- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/hda_jack.c | 90 +++++------------ sound/pci/hda/hda_jack.h | 5 +- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 13 files changed, 266 insertions(+), 101 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt -- 1.9.1

5 15

[alsa-devel] [PATCH] ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()
by Takashi Iwai 27 Apr '15

27 Apr '15

Reported by coverity CID 1296024. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 27333e0d8ebe..b49feff0a319 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -873,14 +873,15 @@ struct hda_pcm *snd_hda_codec_pcm_new(struct hda_codec *codec, struct hda_pcm *pcm; va_list args; - va_start(args, fmt); pcm = kzalloc(sizeof(*pcm), GFP_KERNEL); if (!pcm) return NULL; pcm->codec = codec; kref_init(&pcm->kref); + va_start(args, fmt); pcm->name = kvasprintf(GFP_KERNEL, fmt, args); + va_end(args); if (!pcm->name) { kfree(pcm); return NULL; -- 2.3.5

1 0

[alsa-devel] [PATCH] ALSA: emux: Fix mutex deadlock at unloading
by Takashi Iwai 27 Apr '15

27 Apr '15

The emux-synth driver has a possible AB/BA mutex deadlock at unloading the emu10k1 driver: snd_emux_free() -> snd_emux_detach_seq(): mutex_lock(&emu->register_mutex) -> snd_seq_delete_kernel_client() -> snd_seq_free_client(): mutex_lock(&register_mutex) snd_seq_release() -> snd_seq_free_client(): mutex_lock(&register_mutex) -> snd_seq_delete_all_ports() -> snd_emux_unuse(): mutex_lock(&emu->register_mutex) Basically snd_emux_detach_seq() doesn't need a protection of emu->register_mutex as it's already being unregistered. So, we can get rid of this for avoiding the deadlock. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/synth/emux/emux_seq.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index 7778b8e19782..188fda0effb0 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -124,12 +124,10 @@ snd_emux_detach_seq(struct snd_emux *emu) if (emu->voices) snd_emux_terminate_all(emu); - mutex_lock(&emu->register_mutex); if (emu->client >= 0) { snd_seq_delete_kernel_client(emu->client); emu->client = -1; } - mutex_unlock(&emu->register_mutex); } -- 2.3.5

1 0

Re: [alsa-devel] [PATCH 3/8] mfd: arizona: Add support for WM8998 and WM1814
by Mark Brown 27 Apr '15

27 Apr '15

On Tue, Apr 21, 2015 at 01:33:51PM +0100, Richard Fitzgerald wrote: > + switch (arizona->type) { > + case WM8998: > + case WM1814: > + /* Some bits are shifted on WM8998, > + * rearrange to match the standard bit layout > + */ > + val[0] = ((val[0] & 0x60e0) >> 1) | > + ((val[0] & 0x1e00) >> 2) | > + (val[0] & 0x000f); > + break; Are you sure this approach is going to scale (and avoid confusion)?

2 1

[alsa-devel] [PATCH] ALSA: emu10k1: Fix card shortname string buffer overflow
by Takashi Iwai 27 Apr '15

27 Apr '15

Some models provide too long string for the shortname that has 32bytes including the terminator, and it results in a non-terminated string exposed to the user-space. This isn't too critical, though, as the string is stopped at the succeeding longname string. This patch fixes such entries by dropping "SB" prefix (it's enough to fit within 32 bytes, so far). Meanwhile, it also changes strcpy() with strlcpy() to make sure that this kind of problem won't happen in future, too. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/emu10k1/emu10k1.c | 6 ++++-- sound/pci/emu10k1/emu10k1_main.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 37d0220a094c..db7a2e5e4a14 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -183,8 +183,10 @@ static int snd_card_emu10k1_probe(struct pci_dev *pci, } #endif - strcpy(card->driver, emu->card_capabilities->driver); - strcpy(card->shortname, emu->card_capabilities->name); + strlcpy(card->driver, emu->card_capabilities->driver, + sizeof(card->driver)); + strlcpy(card->shortname, emu->card_capabilities->name, + sizeof(card->shortname)); snprintf(card->longname, sizeof(card->longname), "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i", card->shortname, emu->revision, emu->serial, emu->port, emu->irq); diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 54079f5d5673..4f8cf5e7e45f 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1446,7 +1446,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { * */ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102, - .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]", + .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", .id = "Audigy2", .emu10k2_chip = 1, .ca0108_chip = 1, @@ -1596,7 +1596,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .adc_1361t = 1, /* 24 bit capture instead of 16bit */ .ac97_chip = 1} , {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102, - .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]", + .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]", .id = "Audigy2", .emu10k2_chip = 1, .ca0102_chip = 1, -- 2.3.5

1 0

[alsa-devel] [PATCH 1/2] sound: Close holes in struct snd_pcm_hw_rule
by Lars-Peter Clausen 27 Apr '15

27 Apr '15

On a 64-bit system there are two 32-bit holes due to the alignment of 64-bit fields. Reordering things slightly gets rid of those holes, reducing the size of the struct by 17% percent of its original size. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/pcm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 0cb7f3f..d632809 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -224,9 +224,10 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule { unsigned int cond; - snd_pcm_hw_rule_func_t func; int var; int deps[4]; + + snd_pcm_hw_rule_func_t func; void *private; }; -- 1.8.0

2 3

[alsa-devel] [PATCH 1/2] ALSA: hda - Fix mute-LED fixed mode
by Takashi Iwai 27 Apr '15

27 Apr '15

The mute-LED mode control has the fixed on/off states that are supposed to remain on/off regardless of the master switch. However, this doesn't work actually because the vmaster hook is called in the vmaster code itself. This patch fixes it by calling the hook indirectly after checking the mute LED mode. Reported-and-tested-by: Pali Rohár <pali.rohar(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 873ed1bce12b..27333e0d8ebe 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2082,6 +2082,16 @@ static struct snd_kcontrol_new vmaster_mute_mode = { .put = vmaster_mute_mode_put, }; +/* meta hook to call each driver's vmaster hook */ +static void vmaster_hook(void *private_data, int enabled) +{ + struct hda_vmaster_mute_hook *hook = private_data; + + if (hook->mute_mode != HDA_VMUTE_FOLLOW_MASTER) + enabled = hook->mute_mode; + hook->hook(hook->codec, enabled); +} + /** * snd_hda_add_vmaster_hook - Add a vmaster hook for mute-LED * @codec: the HDA codec @@ -2100,9 +2110,9 @@ int snd_hda_add_vmaster_hook(struct hda_codec *codec, if (!hook->hook || !hook->sw_kctl) return 0; - snd_ctl_add_vmaster_hook(hook->sw_kctl, hook->hook, codec); hook->codec = codec; hook->mute_mode = HDA_VMUTE_FOLLOW_MASTER; + snd_ctl_add_vmaster_hook(hook->sw_kctl, vmaster_hook, hook); if (!expose_enum_ctl) return 0; kctl = snd_ctl_new1(&vmaster_mute_mode, hook); @@ -2128,14 +2138,7 @@ void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook) */ if (hook->codec->bus->shutdown) return; - switch (hook->mute_mode) { - case HDA_VMUTE_FOLLOW_MASTER: - snd_ctl_sync_vmaster_hook(hook->sw_kctl); - break; - default: - hook->hook(hook->codec, hook->mute_mode); - break; - } + snd_ctl_sync_vmaster_hook(hook->sw_kctl); } EXPORT_SYMBOL_GPL(snd_hda_sync_vmaster_hook); -- 2.3.5

1 1

[alsa-devel] Pop noise on startup when headphones are plugged in (Dell XPS13 9333)
by Gabriele Mazzotta 27 Apr '15

27 Apr '15

Hi, I've recently found that commit a551d91473 ("ALSA: hda - Use regmap for command verb caches, too") is somehow causing a pop noise on startup when headphones are plugged in, but I couldn't figure out the exact cause. Was this observed on other systems (mine is a Dell XPS13 9333, Realtek ALC3661)? Does anyone have any idea of what the cause might be? Regards, Gabriele

3 17

[alsa-devel] [PATCH] ASoC: Intel: fix Coccinelle kfree warning
by Firo Yang 27 Apr '15

27 Apr '15

It's not necessary to use kfree() to free memory allocated with devm_kzalloc in a probe function and using kfree leads to a double free. Signed-off-by: Firo Yang <firogm(a)gmail.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9..324eceb 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); -- 2.1.0

2 3

[alsa-devel] [PATCH] rajeev-dlh.kumar@st.com email-id doesn't exist anymore as I have left the company. Replace ST's id with Rajeev Kumar <rajeevkumar.linux@gmail.com>
by Rajeev Kumar 27 Apr '15

27 Apr '15

It also updates .mailmap file to fix address for 'git shortlog' Signed-off-by: Rajeev Kumar <rajeevkumar.linux(a)gmail.com> --- .mailmap | 1 + arch/arm/mach-spear/generic.h | 2 +- arch/arm/mach-spear/include/mach/irqs.h | 2 +- arch/arm/mach-spear/include/mach/spear.h | 2 +- arch/arm/mach-spear/spear6xx.c | 2 +- drivers/input/keyboard/spear-keyboard.c | 2 +- drivers/rtc/rtc-spear.c | 4 ++-- include/linux/platform_data/keyboard-spear.h | 2 +- include/sound/designware_i2s.h | 2 +- include/sound/spear_dma.h | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index 0d971cf..c570755 100644 --- a/.mailmap +++ b/.mailmap @@ -96,6 +96,7 @@ Peter A Jonsson <pj(a)ludd.ltu.se> Peter Oruba <peter(a)oruba.de> Peter Oruba <peter.oruba(a)amd.com> Praveen BP <praveenbp(a)ti.com> +Rajeev Kumar <rajeevkumar.linux(a)gmail.com> Rajesh Shah <rajesh.shah(a)intel.com> Ralf Baechle <ralf(a)linux-mips.org> Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h index a99d90a..0bfd2ea 100644 --- a/arch/arm/mach-spear/generic.h +++ b/arch/arm/mach-spear/generic.h @@ -2,7 +2,7 @@ * spear machine family generic header file * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/irqs.h b/arch/arm/mach-spear/include/mach/irqs.h index 92da0a8..022cf98 100644 --- a/arch/arm/mach-spear/include/mach/irqs.h +++ b/arch/arm/mach-spear/include/mach/irqs.h @@ -2,7 +2,7 @@ * IRQ helper macros for spear machine family * * Copyright (C) 2009-2012 ST Microelectronics - * Rajeev Kumar <rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index f2d6a01..0d2f14d 100644 --- a/arch/arm/mach-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h @@ -2,7 +2,7 @@ * SPEAr3xx/6xx Machine family specific definition * * Copyright (C) 2009,2012 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * Viresh Kumar <viresh.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index da26fa5b..c6dcb0d 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -4,7 +4,7 @@ * SPEAr6XX machines common source file * * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * Copyright 2012 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c index f42a543..623d451 100644 --- a/drivers/input/keyboard/spear-keyboard.c +++ b/drivers/input/keyboard/spear-keyboard.c @@ -3,7 +3,7 @@ * Based on omap-keypad driver * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c index d2cdb98..d14be33 100644 --- a/drivers/rtc/rtc-spear.c +++ b/drivers/rtc/rtc-spear.c @@ -2,7 +2,7 @@ * drivers/rtc/rtc-spear.c * * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -504,6 +504,6 @@ static struct platform_driver spear_rtc_driver = { module_platform_driver(spear_rtc_driver); MODULE_ALIAS("platform:rtc-spear"); -MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar(a)st.com>"); +MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux(a)gmail.com>"); MODULE_DESCRIPTION("ST SPEAr Realtime Clock Driver (RTC)"); MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h index 9248e3a..5e3ff65 100644 --- a/include/linux/platform_data/keyboard-spear.h +++ b/include/linux/platform_data/keyboard-spear.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar(a)st.com> + * Rajeev Kumar <rajeevkumar.linux(a)gmail.com> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h index 26f406e..3a8fca9 100644 --- a/include/sound/designware_i2s.h +++ b/include/sound/designware_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) + * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 diff --git a/include/sound/spear_dma.h b/include/sound/spear_dma.h index 65aca51..e290de4 100644 --- a/include/sound/spear_dma.h +++ b/include/sound/spear_dma.h @@ -1,7 +1,7 @@ /* * linux/spear_dma.h * -* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar(a)st.com) +* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux(a)gmail.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 -- 1.7.9.5

1 0

[alsa-devel] [PATCH v3 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
by Inha Song 27 Apr '15

27 Apr '15

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR. Changes in v3: - Set the hpdet_channel default value to HPDETL If the value is unknown or invalid. Changes in v2: - Use the value in pdata instead of hpdet_channel in extcon_info. - Wrap arizona_extcon_of_get in IS_ENABLED(CONFIG_OF). - Change hpdet_channel type to unsigned from signed in pdata. - Move ARIZONA_ACCDET_MODE_* define to dt-binding header and directly set it to pdata. Inha Song (2): extcon: arizona: Add support for select accessory detect mode when headphone detection mfd: arizona: Update DT binding to support hpdet channel Documentation/devicetree/bindings/mfd/arizona.txt | 6 ++++ drivers/extcon/extcon-arizona.c | 38 ++++++++++++++++++----- include/dt-bindings/mfd/arizona.h | 8 +++++ include/linux/mfd/arizona/pdata.h | 3 ++ 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/mfd/arizona.h -- 2.0.0.390.gcb682f8

2 5

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 25 Apr '15

25 Apr '15

Takashi Sakamoto wrote: > I do not understand techinical details, but the sound was > > perfect even with 192kHz/24bit audio using libffado. > > Ditto. libffado works with such broken stream by ignoring its packet > index. I guess that you've continued to use your device with > uns-ynchronized state for several years because no one reports it. > Well, one reason I believed I was doing fine with my Orpheus is one of the experiments I did in November 2010. ------------------------------------------------------------------------- I copied a 44.1kHz/16bit sound file into a USB memory, and played it on PS3. The optical output (SPDIF) of PS3 is fed into the optical input of Orpheus, and the data is captured using ffado and jackd. Two files, the original and the captured, are compared and showed perfect match. https://spinorlab.wordpress.com/2015/04/25/orpheus-and-bit-perfect/ (see https://spinorlab.files.wordpress.com/2015/04/orpheusbitperfect.jpg) ------------------------------------------------------------------------- I know I should have compared by not only capturing by Orpheus but playing by Orpheus, but I saved my effort assuming the reverse way should also be OK. (Actually, I did not expect any negative results. Was I too optimistic?) *** Therefore, I still can not believe I am experiencing packet losses (without noticing). I mean not with juju+libffado+jackd. I really don't know what is happening with snd-bebob. *** > So if it's only a > > #define TIMER_SOMETHING value_anything > > type of things... > > I cannot understand what you mean. > Never mind. I am not a very technical person anyway. I just thought if it is due to a VERY STRICT timeout checking policy, relaxing the value of timeout might help. > Unless fully understanding specifications about your device, you cannot > make firm statement about it, I think. The drivers installed in Windows > or OS X can set the synchronization when plugging-in. > You are correct! (See the item 8 below.) I did some experiment today, although I am not sure if it has any technical meaning. --------------- My PC runnging on Windows 7 --------------- 1. Run Control Panel, and set Sync Source to PC DAW. 2. Play music with Audacity -> O.K. -> Stop music. 3. Kill Control panel. 4. Set Orpheus to Stand-by Mode 5. Remove Firewire Cable 6. Recover from Stand-by Mode 7. Connect Firewire Cable 8. Run Control Panel, and Sync Source now reads Local, /*** this is not what I expected, but it is so. ***/ so set Sync Source to PC DAW again. 9. Play music with Audacity -> O.K. -> Keep playing 10. Kill Control Panel. -> Music still playing O.K. -> Stop Music 11. Set Orpheus to Stand-by Mode 12. Remove Firewire Cable --------------- Reboot My PC to start Linux --------------- 13. Recover from Stand-by Mode 14. Connect Firewire Cable 15. Enter the following CLIs. % dmesg [ 21.838971] r8169 0000:02:00.0 eth0: link down [ 24.281647] r8169 0000:02:00.0 eth0: link up [ 281.110728] irq_handler: 36 callbacks suppressed [ 281.110737] firewire_ohci 0000:08:00.0: isochronous cycle inconsistent [ 281.612586] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 281.612747] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 % ls -l /proc/asound lrwxrwxrwx 1 root root 5 Apr 25 21:55 Orpheus -> card3 % cat /proc/asound/card3/firewire/clock Sampling rate: 44100 Clock Source: External (MSU-dest: 7) % aplay -D plughw:3,0 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 8192 PERIODS: 4 BUFFER_TIME: (185759 185760) BUFFER_SIZE: 8192 BUFFER_BYTES: 32768 TICK_TIME: 0 % dmesg [ 21.838971] r8169 0000:02:00.0 eth0: link down [ 24.281647] r8169 0000:02:00.0 eth0: link up [ 281.110728] irq_handler: 36 callbacks suppressed [ 281.110737] firewire_ohci 0000:08:00.0: isochronous cycle inconsistent [ 281.612586] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 281.612747] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 *** Regards, Mike Ood

1 0

[alsa-devel] [RFC] dice: simplifying address registration
by Takashi Sakamoto 25 Apr '15

25 Apr '15

Clemens, Would I request your comments about an attached patch? Currently Dice driver keeps address ranges for each unit instance. But there's a way to reuse the same address range. I think this idea can simplify driver probe processing and save resources of host controller. Regards Takashi Sakamoto

2 2

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 25 Apr '15

25 Apr '15

Takashi Sakamoto wrote: > > % cat /proc/asound/card2/firewire/clock > > Sampling rate: 44100 > > Clock Source: External (MSU-dest: 7) > > According to this output, the internal clock of your device is set to > synchronize to external source such as S/PDIF or word clock. Oops. Let me boot my Windows7 again, and see.. https://spinorlab.wordpress.com/2015/04/24/orpheus-and-its-sync-source/ (see orpheussyncsource.jpg) The control program by PrismSound tells that the Sync Source is Local, which means it is a Master and System is sync'ed to Orpheus's local clock. http://www.prismsound.com/music_recording/products_subs/orpheus/online_manu… (Contents -> Orpheus hardware -> Synchronization) (Contents -> Orpheus software -> Orpheus Control Panel) Funny? Now reboot again, and going back to Linux. ------------------ % dmesg <- Orpheus was powered on already. ------------------ [ 20.927594] r8169 0000:02:00.0 eth0: link down [ 23.299665] r8169 0000:02:00.0 eth0: link up [ 27.676032] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 29.974533] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 32.282923] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 34.961027] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 37.259624] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 47.732497] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 50.030918] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 52.339515] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 55.037594] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 57.316079] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 ------------------ % ls -l /proc/asound lrwxrwxrwx 1 root root 5 Apr 24 20:24 Orpheus -> card0 ------------------ % cat /proc/asound/card0/firewire/clock Sampling rate: 44100 Clock Source: External (MSU-dest: 7) <- as Takashi pointed out! ------------------ % aplay -D plughw:0,0 test.wav <- same happens as is expected ------------------ Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 8192 PERIODS: 4 BUFFER_TIME: (185759 185760) BUFFER_SIZE: 8192 BUFFER_BYTES: 32768 TICK_TIME: 0 ------------------ % dmesg <- the last line is added. ------------------ [ 20.927594] r8169 0000:02:00.0 eth0: link down [ 23.299665] r8169 0000:02:00.0 eth0: link up [ 27.676032] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 29.974533] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 32.282923] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 34.961027] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 37.259624] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 47.732497] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 50.030918] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 52.339515] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 55.037594] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 57.316079] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 1483.932836] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 *** > If your device is implemented with no customization of the > setting and you didn't give any external sources to your > device, the device is not synchronized. > (If you give it correctly, please inform it to us.) I am not sure, but I think I gave it correctly to Local Sync Source. > libffado also supports this device and I guess you can > start streaming with jackd and firewire backend Yes, as I have mentioned, I have been always successful with alsa (vanilla without snd-*) + libffado + jackd. > because libffado implements loose > checker of packet discontinuity. I do not understand techinical details, but the sound was perfect even with 192kHz/24bit audio using libffado. So if it's only a #define TIMER_SOMETHING value_anything type of things... > Currently, libffado has a bug to fail to switch clock > source for usual BeBoB driver. > So we have no way to set the source of clock correctly. > I've tried to fix it but get stuck deeply into > ffado's fault and given up. As for me, clock source settings, etc., which is written into its EEPROM when powered off, can be occasionally set via the control program by PrismSound either on Windows/OS X, only when it becomes necessary. So personally I really do not matter, if I understand the situation correctly. > For our information: > http://subversion.ffado.org/wiki/AvcModels/PrismSoundOrpheus I hope some day this level of information becomes usefull for me. Regards, Mike Ood

2 1

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 25 Apr '15

25 Apr '15

Mike Ood wrote: > As for me, clock source settings, etc., > which is written into its EEPROM when powered off, > can be occasionally set via the control program > by PrismSound either on Windows/OS X, > only when it becomes necessary. > I think I was at least partially wrong. The manual says: http://www.prismsound.com/music_recording/products_subs/orpheus/online_manu… (Contents -> Orpheus hardware -> Stand-alone operation): --------------------------------- Stand-alone operation --------------------------------- It is possible to operate Orpheus without a FireWire connection to a host computer. This is done by setting up the unit as required using the Orpheus Control Panel applet whilst it is connected to a host computer via its FireWire interface, then placing the unit in standby by pressing the standby button, before disconnecting the unit from the host and power source. When the unit is re-powered, and detects that no FireWire connection is active, <========== I missed this part! it reloads the settings which were previously stored. As Takashi Sakamoto mentioned: > Currently, libffado has a bug to fail to switch clock > source for usual BeBoB driver. > So we have no way to set the source of clock correctly. > I've tried to fix it but get stuck deeply into > ffado's fault and given up. this could be a problem for me, too. Anyway, the functionality I expect snd-bebob to have is no more than what is offered by juju+libffado+jack. Mike Ood

1 0

[alsa-devel] [PATCH 1/3] ASoC: tas571x: Add DT binding document
by Kevin Cernekee 24 Apr '15

24 Apr '15

Document the bindings for the soon-to-be-added tas571x driver. Signed-off-by: Kevin Cernekee <cernekee(a)chromium.org> --- .../devicetree/bindings/sound/tas571x.txt | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt diff --git a/Documentation/devicetree/bindings/sound/tas571x.txt b/Documentation/devicetree/bindings/sound/tas571x.txt new file mode 100644 index 000000000000..ac704c1f143d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas571x.txt @@ -0,0 +1,34 @@ +Texas Instruments TAS5711/TAS5717/TAS5719 stereo power amplifiers + +The codec is controlled through an I2C interface. It also has two other +signals that can be wired up to GPIOs: reset (strongly recommended), and +powerdown (optional). + +Required properties: + +- compatible: "ti,tas5711", "ti,tas5717", or "ti,tas5719" +- reg: The I2C address of the device +- #sound-dai-cells: must be equal to 0 + +Optional properties: + +- reset-gpios: GPIO specifier for the TAS571x's active low reset line +- pdn-gpios: GPIO specifier for the TAS571x's active low powerdown line +- clocks: clock phandle for the MCLK input +- clock-names: should be "mclk" +- VDD-supply: regulator phandle for the AVDD/DVDD/HP_VDD supply +- PVDD-supply: regulator phandle for the PVDD supply + +Example: + + tas5717: audio-codec@2a { + compatible = "ti,tas5717"; + reg = <0x2a>; + #sound-dai-cells = <0>; + + reset-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + pdn-gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; + + clocks = <&clk_core CLK_I2S>; + clock-names = "mclk"; + }; -- 2.2.0.rc0.207.ga3a616c

4 23

[alsa-devel] [PATCH 00/21] HD-audio controller driver split
by Takashi Iwai 24 Apr '15

24 Apr '15

Hi, here is a patch series to split HD-audio controller driver code to snd-hda-core helper module. It's not targeted for 4.1 but rather for 4.2 together with ASoC HD-audio. There is no real changes from the functionality POV. It's mostly code splits and cleanups. The latest patches are found in topic/hda branch of sound git tree. Takashi === Jeeja KP (2): ALSA: hda - moved alloc/free stream pages function to controller library ALSA: hda - add generic functions to set hdac stream params Ramesh Babu (1): ALSA: hda - add ASoC device type for hda core Takashi Iwai (18): ALSA: hda - Handle error from get_response bus ops directly ALSA: hda - Add the controller helper codes to hda-core module ALSA: hda - Add DSP loader to core library code ALSA: hda - Merge codec and controller helpers ALSA: hda - Move send_cmd / get_response to hdac_bus_ops ALSA: hda - Pass bus io_ops directly from the top-level driver ALSA: hda - Migrate hdac_stream into legacy driver ALSA: hda - Migrate more hdac_stream codes ALSA: hda - Embed bus into controller object ALSA: hda - Minor refactoring ALSA: hda - Move PCM format and rate handling code to core library ALSA: hda - Add missing inclusion of <linux/clocksource.h> ALSA: hda - Reenable tracepoints for controller ALSA: hda/tegra - Fix build error and warning ALSA: hda - Drop azx_sd_read*/write*() macros ALSA: hda - Replace hda_bus_ops with static binding ALSA: hda - Move prepared flag into struct hdac_stream ALSA: hda - Replace open codes with snd_hdac_stream_set_params() include/sound/hda_register.h | 152 +++++ include/sound/hdaudio.h | 286 ++++++++- sound/hda/Kconfig | 3 + sound/hda/Makefile | 2 +- sound/hda/hdac_bus.c | 20 +- sound/hda/hdac_controller.c | 507 +++++++++++++++ sound/hda/hdac_device.c | 300 +++++++++ sound/hda/hdac_stream.c | 686 ++++++++++++++++++++ sound/pci/hda/Kconfig | 3 - sound/pci/hda/Makefile | 3 +- sound/pci/hda/hda_codec.c | 421 +------------ sound/pci/hda/hda_codec.h | 80 +-- sound/pci/hda/hda_controller.c | 1330 ++++++++------------------------------- sound/pci/hda/hda_controller.h | 270 +------- sound/pci/hda/hda_intel.c | 234 ++++--- sound/pci/hda/hda_intel.h | 1 + sound/pci/hda/hda_intel_trace.h | 4 +- sound/pci/hda/hda_tegra.c | 76 +-- sound/pci/hda/patch_ca0132.c | 7 +- 19 files changed, 2457 insertions(+), 1928 deletions(-) create mode 100644 include/sound/hda_register.h create mode 100644 sound/hda/hdac_controller.c create mode 100644 sound/hda/hdac_stream.c -- 2.3.5

1 21

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 24 Apr '15

24 Apr '15

Clemens wrote: > Does this device (with this cable) work in Windows or OS X? Definitely. Let me now reset my PC so that it will boot from its Windows7 partion. With Audacity and a vendor supplied control software, my Orpheus plays 44.1kHz 2-ch sound perfectly. Also, >>>> I have been using my PrismSound Orpheus successfully with juju+ffado+jackd as: for more than five years, not with the same PC but with the same cable, during which time I have never experienced a trouble. And before doing clean install of Ubuntu 15.04 (kernel 3.16) a few days ago, I confirmed that: % jackd -R -dfirewire -r44100 -p4096 -n3 & % aplay -D pcm.jack test.wav or % alsaplayer -i text -o jack -d "system:playback_1,system:playback_2" test.wav works all right on Ubuntu 14.04 with kernel 3.13. So I have an impression that this is not a hardware but a software problem, perhaps specific to snd-bebob.. *** > At the moment, a missing packet results in the driver just stopping the > stream. There would be better ways to handle this, but I haven't yet > found the time to implement this. Any suggestions will be appreciated. Thank you again for taking your time. Regards, Mike Ood

1 0

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 24 Apr '15

24 Apr '15

Clemens wrote: >> You should replace "hw" with "plughw" in the device name. So you were referring to: % aplay -L plughw:CARD=Orpheus,DEV=0 Orpheus, Orpheus PCM Hardware device with all software conversions > Any error message in the system log? % tail dmesg?.txt ==> dmesg1.txt <== this is just after booting. [ 21.439026] r8169 0000:02:00.0 eth0: link down [ 23.809013] r8169 0000:02:00.0 eth0: link up ==> dmesg2.txt <== this is just after connecting Orpheus. [ 21.439026] r8169 0000:02:00.0 eth0: link down [ 23.809013] r8169 0000:02:00.0 eth0: link up [ 110.079264] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 [ 110.343319] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 [ 110.580310] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 113.660273] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 ==> dmesg3.txt <== this is just after % aplay -D plughw:2,0 test.wav [ 21.439026] r8169 0000:02:00.0 eth0: link down [ 23.809013] r8169 0000:02:00.0 eth0: link up [ 110.079264] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 [ 110.343319] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 [ 110.580310] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 [ 113.660273] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 128.010593] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 133.416998] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 [ 136.275142] snd-bebob fw1.0: Detect discontinuity of CIP: 50 70 [ 137.654178] snd-bebob fw1.0: Detect discontinuity of CIP: 70 90 % ls -l dmesg?.txt -rw-rw-r-- 1 user1 user1 72728 Apr 24 08:42 dmesg1.txt -rw-rw-r-- 1 user1 user1 73050 Apr 24 08:42 dmesg2.txt -rw-rw-r-- 1 user1 user1 73318 Apr 24 08:43 dmesg3.txt % egrep 'Apr 24 08:42|Apr 24 08:43' /var/log/syslog Apr 24 08:42:24 host gnome-session[1466]: WARN 2015-04-24 08:42:24 unity.dash.gsettingsscopereader GSettingsScopes.cpp:108 Error fetching protocol metadata for scope: social.scope : Valid key file could not be found in search dirs Apr 24 08:42:44 host kernel: [ 110.079264] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 Apr 24 08:42:45 host kernel: [ 110.343319] firewire_core 0000:08:00.0: phy config: new root=ffc1, gap_count=5 Apr 24 08:42:45 host kernel: [ 110.580310] firewire_core 0000:08:00.0: created device fw1: GUID 00119800010001f9, S400 Apr 24 08:42:48 host kernel: [ 113.660273] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 Apr 24 08:43:02 host kernel: [ 128.010593] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 Apr 24 08:43:08 host kernel: [ 133.416998] snd-bebob fw1.0: Detect discontinuity of CIP: 00 08 Apr 24 08:43:11 host rtkit-daemon[1163]: Supervising 4 threads of 1 processes of 1 users. Apr 24 08:43:11 host rtkit-daemon[1163]: Successfully made thread 1900 of process 1540 (n/a) owned by '1000' RT at priority 5. Apr 24 08:43:11 host rtkit-daemon[1163]: Supervising 5 threads of 1 processes of 1 users. Apr 24 08:43:11 host kernel: [ 136.275142] snd-bebob fw1.0: Detect discontinuity of CIP: 50 70 Apr 24 08:43:12 host kernel: [ 137.654178] snd-bebob fw1.0: Detect discontinuity of CIP: 70 90 Apr 24 08:43:14 host pulseaudio[1540]: [alsa-source-BeBoB] alsa-util.c: Could not recover from POLLERR|POLLNVAL|POLLHUP and XRUN: Connection timed out Apr 24 08:43:17 host systemd[1]: Stopping User Manager for UID 112... *** Any clues? Mike Ood -- % uname -a Linux host 3.19.0-15-generic #15-Ubuntu SMP Thu Apr 16 23:32:37 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux --

3 2

[alsa-devel] [PATCH] ASoC: rt5677: add register patch for PLL
by Bard Liao 24 Apr '15

24 Apr '15

The PLL output will be unstable in some cases. We can fix it by setting some registers. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5677.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index af18258..9c07a0c 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -62,6 +62,9 @@ static const struct reg_default init_list[] = { {RT5677_PR_BASE + 0x1e, 0x0000}, {RT5677_PR_BASE + 0x12, 0x0eaa}, {RT5677_PR_BASE + 0x14, 0x018a}, + {RT5677_PR_BASE + 0x15, 0x0490}, + {RT5677_PR_BASE + 0x38, 0x0f71}, + {RT5677_PR_BASE + 0x39, 0x0f71}, }; #define RT5677_INIT_REG_LEN ARRAY_SIZE(init_list) -- 1.8.1.1.439.g50a6b54

2 1

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 24 Apr '15

24 Apr '15

I am now trying with my capture program, "myprog.cpp" instead of "aplay.c". ------------------------------- % alsacap ; alscap -R ------------------------------- Card 2, ID `Orpheus', name `Orpheus' Device 0, ID `BeBoB', name `Orpheus PCM', 1 subdevices (1 available) 12 channels, sampling rate 44100..44100 Hz Sample formats: S16_LE, S32_LE Subdevice 0, name `subdevice #0' Card 2, ID `Orpheus', name `Orpheus' Device 0, ID `BeBoB', name `Orpheus PCM', 1 subdevices (1 available) 10 channels, sampling rate 44100..44100 Hz Sample formats: S32_LE Subdevice 0, name `subdevice #0' ------------------------------- % myprog hw:2,0 44100 10 ------------------------------- Sound::Sound: sound_device = hw:2,0, rate = 44100, channels = 10 Sound::asound_set_hwparams: begin... Sound::asound_set_hwparams: buffer_time = 92879, dir = 1 Sound::asound_set_hwparams: buffer_size = 4096 Sound::asound_set_hwparams: period_time = 46439 , dir = 1 Sound::asound_set_hwparams: period_size = 2048, dir = 0 Sound::asound_set_hwparams: Unable to set hw params: Connection timed out Sound::Sound: setting of hwparams failed. Connection timed out ------------------------------- Sound::asound_set_hwparams(snd_pcm_t *, snd_pcm_hw_params_t *) ------------------------------- err = snd_pcm_hw_params_any(handle, params); err = snd_pcm_hw_params_set_rate_resample(handle, params, resample); err = snd_pcm_hw_params_set_access(handle, params, err = snd_pcm_hw_params_set_format(handle, params, SND_PCM_FORMAT_S32_LE); //if Orphesu err = snd_pcm_hw_params_set_format(handle, params, SND_PCM_FORMAT_S16); //else err = snd_pcm_hw_params_set_channels(handle, params, channels); err = snd_pcm_hw_params_set_rate_near(handle, params, &rrate, 0); err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, err = snd_pcm_hw_params_get_buffer_size(params, &size); err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, err = snd_pcm_hw_params_get_period_size(params, &size, &dir); err = snd_pcm_hw_params(handle, params); if (err < 0) { cout << "Sound::asound_set_hwparams: Unable to set hw params: " << snd_strerror(err) << endl; return err; } ------------------------------- No messages were found in % demsg and % cat /var/log/syslog concerning the above run of % myprog. So is it (partly) due to "Connection timed out"? Mike Ood

1 0

[alsa-devel] [PATCH] ALSA: hda - fix headset mic detection problem for one more machine
by Hui Wang 24 Apr '15

24 Apr '15

We have two machines with alc256 codec in the pin quirk table, so moving the common pins to ALC256_STANDARD_PINS. Cc: stable(a)vger.kernel.org BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1447909 Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 03975d03..2a72da7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5228,6 +5228,16 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {0x1b, 0x411111f0}, \ {0x1e, 0x411111f0} +#define ALC256_STANDARD_PINS \ + {0x12, 0x90a60140}, \ + {0x14, 0x90170110}, \ + {0x19, 0x411111f0}, \ + {0x1a, 0x411111f0}, \ + {0x1b, 0x411111f0}, \ + {0x1d, 0x40700001}, \ + {0x1e, 0x411111f0}, \ + {0x21, 0x02211020} + #define ALC282_STANDARD_PINS \ {0x14, 0x90170110}, \ {0x18, 0x411111f0}, \ @@ -5328,15 +5338,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1d, 0x40700001}, {0x21, 0x02211050}), SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, - {0x12, 0x90a60140}, - {0x13, 0x40000000}, - {0x14, 0x90170110}, - {0x19, 0x411111f0}, - {0x1a, 0x411111f0}, - {0x1b, 0x411111f0}, - {0x1d, 0x40700001}, - {0x1e, 0x411111f0}, - {0x21, 0x02211020}), + ALC256_STANDARD_PINS, + {0x13, 0x40000000}), + SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, + ALC256_STANDARD_PINS, + {0x13, 0x411111f0}), SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, {0x12, 0x90a60130}, {0x13, 0x40000000}, -- 1.9.1

2 1

[alsa-devel] [ANNOUNCE] Audio Mini Summit 2014, Oct. 14, Düsseldorf, Germany
by Takashi Iwai 24 Apr '15

24 Apr '15

Hi, like previous years, we're going to hold a meeting to discuss lowlevel audio on Linux. This time it's along with Linux Plumbers conference, but for avoiding the conflicts with other LPC mini conferences, it'll be held on Tuesday October 14, at the same venue as LPC, Congress Center Düsseldorf, Germany. If anyone is interested, feel free to sign up in the attendee list below. It's a public accessible Google doc, so you can edit freely. http://goo.gl/VbXLPW (or https://docs.google.com/spreadsheets/d/1wBAiAyZSnMjVFJbxdXE5JoVdKGIBIWt-4tu…) The topics that have been currently raised are found in the URL below. If you have any more topics to discuss there, just put your favorite one in the URL below as well. http://goo.gl/JSasQ9 (or https://docs.google.com/spreadsheets/d/1cXzON65QYNrTXi31AIQHffUZ9NWwJuNEJAC…) Thanks! Takashi

3 2

[alsa-devel] [RFC v2] ASoC: Topology File format
by Liam Girdwood 24 Apr '15

24 Apr '15

Here's V2 of the file format the userspace topology tool will read to generate the binary output file. The output file uses the topology UAPI structures to represent the objects in the text file. This is still WiP and is based on the UCM file format from Jaroslav. Changes from V1. o Added BE's and Codec <-> codec links o Added enumerated and binary controls o Added private data o Moved object names from name field into object top level (like section names). o Control ops binding changed to string+number # Firmware Topology Configuration for Broadwell # TLV scale used by both global and stream volumes SectionTLV."hsw_vol_tlv" { DBScale [ min "-9000" step "300" mute "1" ] } # Values for Equalizer 1 SectionText."EQU1" { Values [ "100Hz", "200Hz", "1kHz" ] } # Private data for Equalizer 1 SectionData."EQU1" { file "/path/to/file" }; # Values for Input Muxes 1,2,3 SectionText."In1" { Values [ "Line", "Mic", ] } # Controls from default pipeline SectionControl."Default Pipeline" { # All controls in this section belong to this Index group/pipeline Index "1" # Master DSP volume Mixer."Master Playback Volume" [ # Channel register and shift for Front Left/Right Channel."FL" [ reg "0" shift "0" ] Channel."FR" [ reg "0" shift "8" ] # max control value and whether value is inverted max "31" invert "false" # control uses bespoke driver get/put/info ID 0 ops "DRV0" # uses TLV data above tlv_array "hsw_vol_tlv" ] # Offload 0 volume Mixer."Media0 Playback Volume" [ # Channel register and shift for Front Left/Right Channel."FL" [ reg "1" shift "0" ] Channel."FR" [ reg "1" shift "8" ] # max control value and whether value is inverted max "31" invert "false" # control uses bespoke driver get/put/info ID 0 ops "DRV0" # uses TLV data above tlv_array "hsw_vol_tlv" ] # Enum controls Enum."Equ1" [ # Texts for enum texts "EQU1" # Channel register and shift for Front Left/Right Channel."FL" [ reg "2" shift "0" ] Channel."FR" [ reg "1" shift "8" ] # control uses bespoke driver get/put/info ID 1 ops "DRV1" # Private data for this control data "EQU1" ] Enum."Input Select" [ # Texts for enum texts "In1" # Channel register and shift for Front Left/Right Channel."FL" [ reg "2" shift "0" ] Channel."FR" [ reg "1" shift "8" ] # control uses bespoke driver get/put/info ID 1 ops "DRV2" ] # Byte controls Bytes [ base "0" num_regs "16" mask "0xff" ] } # DAPM Widgets for main pipeline SectionWidget."Pipeline1" { # All controls in this section belong to this Index group/pipeline Index "1" # SSP AIF input AIF_IN."SSP0 CODEC IN" [ no_pm "true" ] # SSP AIF output AIF_OUT."SSP0 CODEC OUT" [ no_pm "true" ] # Virtual playback mixer MIXER."Playback VMixer" [ no_pm "true" ] # Test input mux MUX."Capture Select" [ no_pm "true" enum "Input Select" ] } # DAPM Routes SectionGraph."Pipeline 1 Graph" { Index "1" Routes [ "Playback VMixer, , System Playback" "Playback VMixer, , Offload0 Playback" "Playback VMixer, , Offload1 Playback" "SSP0 CODEC OUT, , Playback VMixer" "Analog Capture, , SSP0 CODEC IN" ] } # PCM Configurations supported by FW SectionPCMConfig."PCM 48k Stereo 24bit" { Playback [ format "S24_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S24_LE" rate "48000" channels "2" tdm_slot "0xf" ] } SectionPCMConfig."PCM 48k Stereo 16bit" { Playback [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] } SectionPCMConfig."PCM 48k 2P/4C 16bit" { Playback [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S16_LE" rate "48000" channels "4" tdm_slot "0xf" ] } SectionPCMConfig."PCM 8k Mono 16bit" { Playback [ format "S16_LE" rate "8000" channels "1" ] Capture [ format "S16_LE" rate "8000" channels "1" ] } # PCM capabilities supported by FW SectionPCMCapabilities."System Playback" { Capabilities [ formats "S24_LE, S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "2" ] } SectionPCMCapabilities."Analog Capture" { Capabilities [ formats "S24_LE, S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "4" ] } SectionPCMCapabilities."Offload Pin Playback" { Capabilities [ formats "S24_LE, S16_LE" rate_min "8000" rate_max "192000" channels_min "2" channels_max "2" ] } SectionPCMCapabilities."Loopback Capture" { Capabilities [ formats "S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "2" ] } SectionPCMCapabilities."BT" { Capabilities [ formats "S16_LE" rate_min "8000" rate_max "8000" channels_min "1" channels_max "1" ] } # PCM devices exported by Firmware SectionPCM."System Pin" { Index "1" # used for binding to the PCM ID "0" Playback [ Capabilities "System Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] Capture [ Capabilities "Analog Capture" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" Config "PCM 48k 2P/4C 16bit" ] } SectionPCM."Offload Pin 0" { Index "1" # used for binding to the PCM ID "1" Playback [ Capabilities "Offload Pin Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] } SectionPCM."Offload Pin 1" { Index "1" # used for binding to the PCM ID "2" Playback [ Capabilities "Offload Pin Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] } SectionPCM."Loopback Pin" { Index "1" # used for binding to the PCM ID "3" Capture [ Capabilities "Loopback Capture" Config "PCM 48k Stereo 16bit" ] } # Backend DAI links SectionBE."SSP0-Codec" { Index "1" # used for binding to the BE DAI link ID "0" # BE DAI link capabilities and supported configs Playback [ Capabilities "System Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] Capture [ Capabilities "Analog Capture" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" Config "PCM 48k 2P/4C 16bit" ] } SectionBE."SSP1-BT" { Index "1" # used for binding to the BE DAI link ID "1" # BE DAI link capabilities and supported configs Playback [ Capabilities "BT" Config "PCM 8k Mono 16bit" ] Capture [ Capabilities "BT" Config "PCM 8k Mono 16bit" ] } # Codec <-> Codec style links SectionCC."FM-Codec" { Index "1" # used for binding to the CC link ID "0" # CC DAI link capabilities and supported configs Playback [ Capabilities "System Playback" Config "PCM 48k Stereo 16bit" ] Capture [ Capabilities "Analog Capture" Config "PCM 48k Stereo 16bit" ] }

1 0

[alsa-devel] [PATCH 0/8] Proc file cleanups
by Takashi Iwai 23 Apr '15

23 Apr '15

Hi, here is a series of patches for cleaning up the ALSA proc file management code. The biggest change is the use of seq_file for text reads, but all are internal and the API is kept intact. The rest are mostly small cleanups and refactoring. The patches are found in topic/proc branch of sound git tree. Takashi === Takashi Iwai (8): ALSA: core: Use seq_file for text proc file reads ALSA: core: Fix possible memory leaks at error path in info.c ALSA: core: Remove child proc file elements recursively ALSA: core: Manage asound root directory with snd_info_entry ALSA: core: Remove superfluous exit calls for proc entries ALSA: core: Don't ignore errors at creating proc files ALSA: core: Build conditionally and remove superfluous ifdefs ALSA: core: Clean up OSS proc file management include/sound/core.h | 4 - include/sound/info.h | 29 +- sound/core/Makefile | 8 +- sound/core/info.c | 779 ++++++++++++++++++---------------------------- sound/core/info_oss.c | 29 +- sound/core/init.c | 33 +- sound/core/seq/Makefile | 3 +- sound/core/seq/seq_info.c | 19 +- sound/core/sound.c | 24 +- sound/core/sound_oss.c | 30 +- 10 files changed, 373 insertions(+), 585 deletions(-) -- 2.3.5

2 9

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 23 Apr '15

23 Apr '15

Clemens wrote: > You should not write an .asoundrc. > You should replace "hw" with "plughw" in the device name. Somewhat different messages, but still aborts immediately. (There is a relay click sound from Orpheus, as it always does before playing music, so it is getting slightly better..) % ls -l .asound* -rw-rw-r-- 1 user1 user1 65 Apr 23 21:48 .asoundrc-nogo % grep asound /usr/share/alsa/alsa.conf "/etc/asound.conf" "~/.asoundrc" % sudo ls -l /etc/asound.conf ls: cannot access /etc/asound.conf: No such file or directory % aplay -D plughw:2,0 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 8192 PERIODS: 4 BUFFER_TIME: (185759 185760) BUFFER_SIZE: 8192 BUFFER_BYTES: 32768 TICK_TIME: 0 % aplay -D plughw:2 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1297: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 44100 PERIOD_TIME: (46439 46440) PERIOD_SIZE: 2048 PERIOD_BYTES: 8192 PERIODS: 4 BUFFER_TIME: (185759 185760) BUFFER_SIZE: 8192 BUFFER_BYTES: 32768 TICK_TIME: 0 % aplay -D default:2,0 test.wav ALSA lib conf.c:4705:(snd_config_expand) Unknown parameters 2,0 ALSA lib pcm.c:2239:(snd_pcm_open_noupdate) Unknown PCM default:2,0 aplay: main:722: audio open error: Invalid argument % aplay -D default:2 test.wav ALSA lib conf.c:4705:(snd_config_expand) Unknown parameters 2 ALSA lib pcm.c:2239:(snd_pcm_open_noupdate) Unknown PCM default:2 aplay: main:722: audio open error: Invalid argument Regards, Mike Ood

2 1

[alsa-devel] alsa-driver-build on kernel 3.13
by Raymond Yau 23 Apr '15

23 Apr '15

Do alsa-driver-build still support on kernel 3.13 ? Some of the modules have been built but not installed on Ubuntu 14.04 LTS [ 7.547726] snd_hda_codec: Unknown symbol snd_hdac_get_connections (err 0) [ 7.547733] snd_hda_codec: Unknown symbol snd_hdac_power_up_pm (err 0) [ 7.547749] snd_hda_codec: Unknown symbol snd_hdac_regmap_read_raw (err 0) [ 7.547762] snd_hda_codec: Unknown symbol snd_hdac_power_down (err 0) [ 7.547768] snd_hda_codec: Unknown symbol snd_hdac_make_cmd (err 0) [ 7.547783] snd_hda_codec: Unknown symbol snd_hdac_regmap_init (err 0) [ 7.547797] snd_hda_codec: Unknown symbol snd_hdac_refresh_widgets (err 0) [ 7.547824] snd_hda_codec: Unknown symbol snd_hdac_bus_exit (err 0) [ 7.547832] snd_hda_codec: Unknown symbol _snd_hdac_read_parm (err 0) [ 7.547845] snd_hda_codec: Unknown symbol snd_hdac_bus_exec_verb_unlocked (err 0) [ 7.547849] snd_hda_codec: Unknown symbol snd_hdac_override_parm (err 0) [ 7.547857] snd_hda_codec: Unknown symbol snd_hdac_device_register (err 0) [ 7.547862] snd_hda_codec: Unknown symbol snd_hdac_regmap_update_raw (err 0) [ 7.547878] snd_hda_codec: Unknown symbol snd_hdac_bus_init (err 0) [ 7.547886] snd_hda_codec: Unknown symbol snd_hdac_read_parm_uncached (err 0) [ 7.547892] snd_hda_codec: Unknown symbol snd_hdac_device_unregister (err 0) [ 7.547896] snd_hda_codec: Unknown symbol snd_hdac_device_init (err 0) [ 7.547908] snd_hda_codec: Unknown symbol snd_hdac_power_down_pm (err 0) [ 7.547924] snd_hda_codec: Unknown symbol snd_hdac_regmap_write_raw (err 0) [ 7.547933] snd_hda_codec: Unknown symbol snd_hdac_regmap_exit (err 0) [ 7.547943] snd_hda_codec: Unknown symbol snd_hda_bus_type (err 0) [ 7.547949] snd_hda_codec: Unknown symbol snd_hdac_device_exit (err 0) [ 7.547956] snd_hda_codec: Unknown symbol snd_hdac_get_sub_nodes (err 0) [ 7.547964] snd_hda_codec: Unknown symbol snd_hdac_exec_verb (err 0) [ 7.547973] snd_hda_codec: Unknown symbol snd_array_new (err 0) [ 7.547981] snd_hda_codec: Unknown symbol snd_array_free (err 0) [ 7.547994] snd_hda_codec: Unknown symbol snd_hdac_power_up (err 0) [ 7.548197] snd_hda_codec: Unknown symbol snd_hdac_get_connections (err 0) [ 7.548202] snd_hda_codec: Unknown symbol snd_hdac_power_up_pm (err 0) [ 7.548214] snd_hda_codec: Unknown symbol snd_hdac_regmap_read_raw (err 0) [ 7.548225] snd_hda_codec: Unknown symbol snd_hdac_power_down (err 0) [ 7.548231] snd_hda_codec: Unknown symbol snd_hdac_make_cmd (err 0) [ 7.548244] snd_hda_codec: Unknown symbol snd_hdac_regmap_init (err 0) [ 7.548256] snd_hda_codec: Unknown symbol snd_hdac_refresh_widgets (err 0) [ 7.548281] snd_hda_codec: Unknown symbol snd_hdac_bus_exit (err 0) [ 7.548287] snd_hda_codec: Unknown symbol _snd_hdac_read_parm (err 0) [ 7.548298] snd_hda_codec: Unknown symbol snd_hdac_bus_exec_verb_unlocked (err 0) [ 7.548302] snd_hda_codec: Unknown symbol snd_hdac_override_parm (err 0) [ 7.548310] snd_hda_codec: Unknown symbol snd_hdac_device_register (err 0) [ 7.548315] snd_hda_codec: Unknown symbol snd_hdac_regmap_update_raw (err 0) [ 7.548330] snd_hda_codec: Unknown symbol snd_hdac_bus_init (err 0) [ 7.548338] snd_hda_codec: Unknown symbol snd_hdac_read_parm_uncached (err 0) [ 7.548343] snd_hda_codec: Unknown symbol snd_hdac_device_unregister (err 0) [ 7.548347] snd_hda_codec: Unknown symbol snd_hdac_device_init (err 0) [ 7.548357] snd_hda_codec: Unknown symbol snd_hdac_power_down_pm (err 0) [ 7.548372] snd_hda_codec: Unknown symbol snd_hdac_regmap_write_raw (err 0) [ 7.548380] snd_hda_codec: Unknown symbol snd_hdac_regmap_exit (err 0) [ 7.548389] snd_hda_codec: Unknown symbol snd_hda_bus_type (err 0) [ 7.548395] snd_hda_codec: Unknown symbol snd_hdac_device_exit (err 0) [ 7.548402] snd_hda_codec: Unknown symbol snd_hdac_get_sub_nodes (err 0) [ 7.548410] snd_hda_codec: Unknown symbol snd_hdac_exec_verb (err 0) [ 7.548418] snd_hda_codec: Unknown symbol snd_array_new (err 0) [ 7.548426] snd_hda_codec: Unknown symbol snd_array_free (err 0) [ 7.548438] snd_hda_codec: Unknown symbol snd_hdac_power_up (err 0)

2 1

Re: [alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 23 Apr '15

23 Apr '15

Clemens wrote: > You are trying to play a two-channel file ... > ... on a device that supports only ten channels. This is what I was vaguely afraid of... > An with "hw", you have disabled any automatic format conversion. > Try "plughw:2" or "default:2". Could you be kind enough to suggest how I should write .asoundrc? I only know the obvious one for jack: .asoundrc ---------------- pcm.jackplug { type plug slave { pcm "jack" } } pcm.jack { type jack playback_ports { 0 alsa_pcm:playback_1 1 alsa_pcm:playback_2 } capture_ports { 0 alsa_pcm:capture_1 1 alsa_pcm:capture_2 } } ---------------- Regards, Mike Ood

2 1

[alsa-devel] snd-bebob and PrismSound Orpheus fails with snd_pcm_hw_params_set_channels
by Mike Ood 23 Apr '15

23 Apr '15

Hi All, I have been using my PrismSound Orpheus successfully with juju+ffado+jackd as: % jackd -R -dfirewire -r44100 -p4096 -n3 & % aplay -D pcm.jack test.wav or % alsaplayer -i text -o jack -d "system:playback_1,system:playback_2" test.wav on Ubuntu 14.04 with kernel 3.13 or so. *** Today I clean installed ubuntu 14.10 wishing to use snd-bebob, but unfortunately % sudo aplay -D hw:2,0 --channels=2 test.wav does not work with the following messages: Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1239: Channels count non available aplay.c: 1237 err = snd_pcm_hw_params_set_channels(handle, params, hwparams.channels); 1238 if (err < 0) { 1239 error(_("Channels count non available")); 1240 prg_exit(EXIT_FAILURE); 1241 } My short capture program, which works fine with USB audio devices, does not work either at the same place. myprog.cpp: /* set the count of channels */ err = snd_pcm_hw_params_set_channels(handle, params, channels); if (err < 0) { cout << "Sound::asound_set_hwparams: Channels count " << channels << " is not available for playbacks." << snd_strerror(err) << endl; return err; } Does anybody have any suggestions for me? Mike ODD *** (for your information) *** % uname -a Linux host 3.16.0-34-generic #47-Ubuntu SMP Fri Apr 10 18:02:58 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux % ls -l /dev/fw* crw------- 1 root root 250, 0 Apr 23 13:57 /dev/fw0 crw-rw----+ 1 root video 250, 1 Apr 23 13:57 /dev/fw1 % lsmod | grep snd_bebob snd_bebob 40777 0 snd_firewire_lib 29081 1 snd_bebob snd_hwdep 17698 3 snd_usb_audio,snd_bebob,snd_hda_codec snd_pcm 104102 8 snd_firewire_lib,snd_usb_audio,snd_bebob,snd_hda_codec_hdmi,snd_hda_codec,snd_hda_intel,snd_hda_controller snd_rawmidi 30876 4 snd_firewire_lib,snd_bebob,snd_usbmidi_lib,snd_seq_midi snd 87611 31 snd_hda_codec_realtek,snd_usb_audio,snd_bebob,snd_hwdep,snd_timer,snd_hda_codec_hdmi,snd_pcm,snd_seq,snd_rawmidi,snd_hda_codec_generic,snd_usbmidi_lib,snd_hda_codec,snd_hda_intel,snd_seq_device firewire_core 68671 3 snd_firewire_lib,snd_bebob,firewire_ohci % ls -l /proc/asound total 0 dr-xr-xr-x 6 root root 0 Apr 23 21:02 card0 dr-xr-xr-x 3 root root 0 Apr 23 21:02 card1 dr-xr-xr-x 5 root root 0 Apr 23 21:02 card2 dr-xr-xr-x 4 root root 0 Apr 23 21:02 card3 -r--r--r-- 1 root root 0 Apr 23 21:02 cards lrwxrwxrwx 1 root root 5 Apr 23 21:02 CODEC -> card3 -r--r--r-- 1 root root 0 Apr 23 21:02 devices lrwxrwxrwx 1 root root 5 Apr 23 21:02 HDMI -> card1 -r--r--r-- 1 root root 0 Apr 23 21:02 hwdep lrwxrwxrwx 1 root root 5 Apr 23 21:02 MID -> card0 -r--r--r-- 1 root root 0 Apr 23 21:02 modules lrwxrwxrwx 1 root root 5 Apr 23 21:02 Orpheus -> card2 dr-xr-xr-x 2 root root 0 Apr 23 21:02 oss -r--r--r-- 1 root root 0 Apr 23 21:02 pcm dr-xr-xr-x 2 root root 0 Apr 23 21:02 seq -r--r--r-- 1 root root 0 Apr 23 21:02 timers -r--r--r-- 1 root root 0 Apr 23 21:02 version % ls -l /proc/asound/card2 total 0 dr-xr-xr-x 2 root root 0 Apr 23 21:02 firewire -r--r--r-- 1 root root 0 Apr 23 21:02 id -r--r--r-- 1 root root 0 Apr 23 21:02 midi0 dr-xr-xr-x 3 root root 0 Apr 23 21:02 pcm0c dr-xr-xr-x 3 root root 0 Apr 23 21:02 pcm0p % cat /proc/asound/card2/id Orpheus % ls -l /proc/asound/card2/firewire total 0 -r--r--r-- 1 root root 0 Apr 23 21:03 clock -r--r--r-- 1 root root 0 Apr 23 21:03 firmware -r--r--r-- 1 root root 0 Apr 23 21:03 formation % cat /proc/asound/card2/firewire/clock Sampling rate: 44100 Clock Source: External (MSU-dest: 7) % cat /proc/asound/card2/firewire/firmware Manufacturer: bridgeCo Protocol Ver: 3 Build Ver: 0 GUID: 0x00119800010001F9 Model ID: 0x13 Model Rev: 0 Firmware Date: 20100205 Firmware Time: 105129 Firmware ID: 0x10048 Firmware Ver: 6572 Base Addr: 0x400C0080 Max Size: 1519984 Loader Date: 20070118 Loader Time: 101440 % cat /proc/asound/card2/firewire/formation Output Stream from device: Rate PCM MIDI 32000 0 0 44100 10 1 48000 10 1 88200 10 1 96000 10 1 176400 10 1 192000 10 1 Input Stream to device: Rate PCM MIDI 32000 0 0 44100 12 1 48000 12 1 88200 12 1 96000 12 1 176400 12 1 192000 12 1 % ls -l /proc/asound/card2/pcm0c total 0 -r--r--r-- 1 root root 0 Apr 23 21:05 info dr-xr-xr-x 2 root root 0 Apr 23 21:05 sub0 % ls -l /proc/asound/card2/pcm0p total 0 -r--r--r-- 1 root root 0 Apr 23 21:06 info dr-xr-xr-x 2 root root 0 Apr 23 21:06 sub0 % cat /proc/asound/card2/pcm0c/info card: 2 device: 0 subdevice: 0 stream: CAPTURE id: BeBoB name: Orpheus PCM subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 % cat /proc/asound/card2/pcm0p/info card: 2 device: 0 subdevice: 0 stream: PLAYBACK id: BeBoB name: Orpheus PCM subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 *** (end of information) ***

2 1

[alsa-devel] [PATCH] ASoC: Intel: fix the makefile for atom code
by Vinod Koul 23 Apr '15

23 Apr '15

The tom code should be using SND_SST_MFLD_PLATFORM and not the baytrail one. So fix it now Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index cd9aee9871a3..3853ec2ddbc7 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SST) += common/ # Platform Support obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ -obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += atom/ +obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += atom/ # Machine support obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/ -- 1.7.9.5

2 1

[alsa-devel] [RFC] File format for topology data
by Liam Girdwood 23 Apr '15

23 Apr '15

I've pasted below the topology data for the broadwell firmware using the text file format being used by UCM. Using the UCM format allows to to share parser code and allows us to also have UCM define topology data. I've not yet completed the byte or enum controls but the rest of the data is there for comments. I've also included the recent channel changes suggested in the UAPI header comments. # Firmware Topology Configuration for Broadwell # TLV scale used by both global and stream volumes SectionTLV."hsw_vol_tlv" { DBScale [ min "-9000" step "300" mute "1" ] } # Controls from default pipeline SectionControl."Default Pipeline" { Index "1" # Master DSP volume Mixer [ name "Master Playback Volume" Channel.0 [ map "Left" reg "0" shift "0" ] Channel.1 [ map "Right" reg "0" shift "8" ] max "31" invert "false" get "0" put "0" tlv_array "hsw_vol_tlv" ] # Offload 0 volume Mixer [ name "Media0 Playback Volume" Channel.0 [ map "Left" reg "1" shift "0" ] Channel.1 [ map "Right" reg "1" shift "8" ] max "31" invert "false" get "1" put "1" tlv_array "hsw_vol_tlv" ] # Enum controls Enum [ ... ] # Byte controls Bytes [ ... ] } # DAPM Widgets for main pipeline SectionWidget."Pipeline1" { Index "1" AIF_IN [ name "SSP0 CODEC IN" stream_name "" slot "" reg "0" shift "0" invert "false" ] AIF_OUT [ name "SSP0 CODEC OUT" stream_name "" slot "" reg "0" shift "0" invert "false" ] ... } # DAPM Routes SectionGraph."Pipeline 1 Graph" { Index 1 Routes [ "Playback VMixer, , System Playback" "Playback VMixer, , Offload0 Playback" "Playback VMixer, , Offload1 Playback" "SSP0 CODEC OUT, , Playback VMixer" "Analog Capture, , SSP0 CODEC IN" ] } # PCM Configurations supported by FW SectionPCMConfig."PCM 48k Stereo 24bit" { Playback [ format "S24_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S24_LE" rate "48000" channels "2" tdm_slot "0xf" ] } SectionPCMConfig."PCM 48k Stereo 16bit" { Playback [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] } SectionPCMConfig."PCM 48k 2P/4C 16bit" { Playback [ format "S16_LE" rate "48000" channels "2" tdm_slot "0xf" ] Capture [ format "S16_LE" rate "48000" channels "4" tdm_slot "0xf" ] } # PCM capabilities supported by FW SectionPCMCapabilities."System Playback" { Capabilities [ formats "S24_LE, S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "2" ] } SectionPCMCapabilities."Analog Capture" { Capabilities [ formats "S24_LE, S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "4" ] } SectionPCMCapabilities."Offload Pin Playback" { Capabilities [ formats "S24_LE, S16_LE" rate_min "8000" rate_max "192000" channels_min "2" channels_max "2" ] } SectionPCMCapabilities."Loopback Capture" { Capabilities [ formats "S16_LE" rate_min "48000" rate_max "48000" channels_min "2" channels_max "2" ] } # PCM devices exported by Firmware SectionPCM."System Pin" { Index 1 Playback [ Capabilities "System Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] Capture [ Capabilities "Analog Capture" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" Config "PCM 48k 2P/4C 16bit" ] } SectionPCM."Offload Pin 0" { Index 1 Playback [ Capabilities "Offload Pin Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] } SectionPCM."Offload Pin 1" { Index 1 Playback [ Capabilities "Offload Pin Playback" Config "PCM 48k Stereo 24bit" Config "PCM 48k Stereo 16bit" ] } SectionPCM."Loopback Pin" { Index 1 Capture [ Capabilities "Loopback Capture" Config "PCM 48k Stereo 16bit" ] }

3 4

[alsa-devel] [PATCH] ALSA: hda - add AZX_DCAPS_I915_POWERWELL to Baytrail
by mengdong.lin＠intel.com 23 Apr '15

23 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch addes AZX_DCAPS_I915_POWERWELL to BYT (Baytrail). Like Braswell and Skylake, the HDMI codec on Bytrail is also in the shared power well with GPU. This power well must be turned on before we reset link to probe the codec, to avoid communication failure with the codec. The side effect is that this power is always ON in S0 because the BYT HDMI codec does not support EPSS or D3ClkStop and so the controller doesn't enter D3 at runtime, and the HDMI codec and analog codec share a single physical HD-A link and so we cannot reset the HD-A link freely when we re-enable the power to use the HDMI codec. Next step is to test if an AGP reset or double AGP reset on BYT HDMI codec is okay to bring the HDMI codec back to a functional state after restoring the power. If okay, we can bind the power on/off with the HDMI codec PM without interrupting the analog audio. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e1c2105..34040d2 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -297,6 +297,9 @@ enum { AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\ AZX_DCAPS_SNOOP_TYPE(SCH)) +#define AZX_DCAPS_INTEL_BAYTRAIL \ + (AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_I915_POWERWELL) + #define AZX_DCAPS_INTEL_BRASWELL \ (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_I915_POWERWELL) @@ -1992,7 +1995,7 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, /* BayTrail */ { PCI_DEVICE(0x8086, 0x0f04), - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL }, /* Braswell */ { PCI_DEVICE(0x8086, 0x2284), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL }, -- 1.9.1

4 5

[alsa-devel] [RFC] bind/unbind SoC devices with deferred list
by Kuninori Morimoto 23 Apr '15

23 Apr '15

Hi Takashi, Mark, Lars I worked for bind/unbind issue which was discussed before http://thread.gmane.org/gmane.linux.alsa.devel/134062/focus=134076 http://thread.gmane.org/gmane.linux.alsa.devel/134283/focus=134287 I would like to know your opinion before sending patch to Greg The problem is ASoC has card/platform/cpu/codec relationship for each other, but, we can unbind one of them, and then, other related devices doesn't know about it. Thus, kernel will error if we use sound after that. Here is example of this issue. It unbind cpu (= rcar_sound), playback sound, and, error. And, we can't re-bind after this. // check current sound card > aplay -l **** List of PLAYBACK Hardware Devices **** card 0: rsnddai0ak4642h [rsnd-dai.0-ak4642-hifi], device 0: rsnd-dai.0-ak4642-hifi ak4642-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 // unbind cpu (= rcar_sound) > echo ec500000.rcar_sound > /sys/bus/platform/drivers/rcar_sound/unbind // recheck sound card // card doesn't know cpu was removed > aplay -l **** List of PLAYBACK Hardware Devices **** card 0: rsnddai0ak4642h [rsnd-dai.0-ak4642-hifi], device 0: rsnd-dai.0-ak4642-hifi ak4642-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 // kernel error happen if playback > aplay xxx.wav Unable to handle kernel NULL pointer dereference at virtual address 00000100 pgd = ee97c000 ... // we can't re-bind cpu > echo ec500000.rcar_sound > /sys/bus/platform/drivers/rcar_sound/bind -- freeze -- I hacked this issue to using deferred list, and created attached patch. it is all-in-one patch. but it solved my issue. I would like to know your opinion about this. // check current sound card > aplay -l **** List of PLAYBACK Hardware Devices **** card 0: rsnddai0ak4642h [rsnd-dai.0-ak4642-hifi], device 0: rsnd-dai.0-ak4642-hifi ak4642-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 // unbind cpu (= rcar_sound) > echo ec500000.rcar_sound > /sys/bus/platform/drivers/rcar_sound/unbind (local debug message) release ec500000.rcar_sound (local debug message) release related device - sound (local debug message) related related device - 6-0012 // recheck sound card // it knows there is no available card > aplay -l aplay: device_list:268: no soundcards found... // re-bind lost cpu (= rcar_sound) // it re-bind sound card > echo ec500000.rcar_sound > /sys/bus/platform/drivers/rcar_sound/bind rcar_sound ec500000.rcar_sound: probed asoc-simple-card sound: ak4642-hifi <-> ec500000.rcar_sound mapping ok // let's unbind codec side (= ak4642) this time > echo 6-0012 > /sys/bus/i2c/drivers/ak4642-codec/unbind (local debug message) release 6-0012 (local debug message) release related device - ec500000.rcar_sound (local debug message) related related device - sound // recheck sound card // it knows there is no available card > aplay -l aplay: device_list:268: no soundcards found... // re-bind lost codec (= ak4642) // it re-bind sound card > echo 6-0012 > /sys/bus/i2c/drivers/ak4642-codec/bind rcar_sound ec500000.rcar_sound: probed asoc-simple-card sound: ak4642-hifi <-> ec500000.rcar_sound mapping ok --- patch --- From 9da5324a659ff596a2733f14b768b6b8c5a04f3b Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Wed, 22 Apr 2015 16:53:49 +0900 Subject: [PATCH] no Subject at this point Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- drivers/base/base.h | 1 + drivers/base/core.c | 9 +++++++++ drivers/base/dd.c | 21 ++++++++++++++++++++- include/linux/device.h | 1 + sound/soc/soc-core.c | 4 ++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 251c5d3..1a71a52 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -74,6 +74,7 @@ struct device_private { struct klist_node knode_driver; struct klist_node knode_bus; struct list_head deferred_probe; + struct list_head related_dev; struct device *device; }; #define to_device_private_parent(obj) \ diff --git a/drivers/base/core.c b/drivers/base/core.c index 21d1303..643146f 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -948,9 +948,18 @@ int device_private_init(struct device *dev) klist_init(&dev->p->klist_children, klist_children_get, klist_children_put); INIT_LIST_HEAD(&dev->p->deferred_probe); + INIT_LIST_HEAD(&dev->p->related_dev); + return 0; } +void device_related_device(struct device *dev, struct device *node) +{ + if (list_empty(&node->p->related_dev)) + list_add(&node->p->related_dev, &dev->p->related_dev); +} +EXPORT_SYMBOL_GPL(device_related_device); + /** * device_add - add device to device hierarchy. * @dev: device. diff --git a/drivers/base/dd.c b/drivers/base/dd.c index e843fdb..3d218c6 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -516,7 +516,7 @@ EXPORT_SYMBOL_GPL(driver_attach); * __device_release_driver() must be called with @dev lock held. * When called for a USB interface, @dev->parent lock must be held as well. */ -static void __device_release_driver(struct device *dev) +static void _device_release_driver(struct device *dev) { struct device_driver *drv; @@ -552,6 +552,25 @@ static void __device_release_driver(struct device *dev) } } +static void __device_release_driver(struct device *dev) +{ + struct device_private *dp, *d; + + /* release dev itself */ + _device_release_driver(dev); + + list_for_each_entry_safe(dp, d, &dev->p->related_dev, related_dev) { + /* + * temporarily, release related device. + * these are push to deferred_probe_pending_list. + * It can be re-probed if it didn't call device_del() + */ + _device_release_driver(dp->device); + driver_deferred_probe_add(dp->device); + list_del_init(&dp->related_dev); + } +} + /** * device_release_driver - manually detach device from driver. * @dev: device. diff --git a/include/linux/device.h b/include/linux/device.h index 6558af9..2b81804 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -924,6 +924,7 @@ void driver_init(void); extern int __must_check device_register(struct device *dev); extern void device_unregister(struct device *dev); extern void device_initialize(struct device *dev); +extern void device_related_device(struct device *dev, struct device *node); extern int __must_check device_add(struct device *dev); extern void device_del(struct device *dev); extern int device_for_each_child(struct device *dev, void *data, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2373252..01c0d56 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -22,6 +22,7 @@ * o Support TDM on PCM and I2S */ +#include <linux/device.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> @@ -946,6 +947,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num) dai_link->cpu_dai_name); return -EPROBE_DEFER; } + device_related_device(card->dev, rtd->cpu_dai->dev); rtd->num_codecs = dai_link->num_codecs; @@ -962,6 +964,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num) /* Single codec links expect codec and codec_dai in runtime data */ rtd->codec_dai = codec_dais[0]; rtd->codec = rtd->codec_dai->codec; + device_related_device(card->dev, rtd->codec->dev); /* if there's no platform we match on the empty platform */ platform_name = dai_link->platform_name; @@ -986,6 +989,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num) dai_link->platform_name); return -EPROBE_DEFER; } + device_related_device(card->dev, rtd->platform->dev); card->num_rtd++; -- 1.9.1 Best regards --- Kuninori Morimoto

3 3

[alsa-devel] [PATCH] ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE
by Charles Keepax 22 Apr '15

22 Apr '15

Correct small copy and paste error where autodisable was not being enabled for the SOC_DAPM_SINGLE_TLV_AUTODISABLE control. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- include/sound/soc-dapm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 0bc8364..1065095 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -287,7 +287,7 @@ struct device; .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) } + .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) } #define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \ SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array) #define SOC_DAPM_ENUM(xname, xenum) \ -- 1.7.2.5

2 1

Re: [alsa-devel] Playback - Overwrite buffer with silence
by Clemens Ladisch 22 Apr '15

22 Apr '15

Nilhcraiv wrote: > To set the Buffer size and Periord size I have use the > snd_pcm_hw_params_set_period_size_near() and > snd_pcm_hw_params_set_buffer_size_near() functions. If I do not use > the ...near() functions, I return errors. The allowed values of the hardware parameters depend on the hardware's capabilities. Regards, Clemens

3 4

[alsa-devel] [PATCH v8 0/7] ALSA: jack: Refactoring for jack kctls
by Jie Yang 22 Apr '15

22 Apr '15

Currently only hda will create kctls for hda jacks, for asoc, people may need create jack kctls in specific driver. Here we are introducing kctls for each jack, by creating kctls and add them to jack controls list (considering exist of combo jack). At the same time, we will report events for each control in the list. With this new implementation, both HDA and soc jack kctls works fine, they are compatible for old HDA jack kctls, too. For soc, a. snd_jack_new() with NULL jack_kctl; b. for each pin, call snd_jack_add_kctls() to add one kctl(it will call snd_ctl_add() to add kctl to card); For HDA, With snd_jack_new(), we can use phantom_jack = true for phantom jack creating, and the jack kctl pointer will be filled with the new created kcontrol. Changes in v8: 1. remove snd_jack_kctl from HDA part, change snd_jack_new param to use bool for creating kcontrol at jack creating stage; 2. create jack for phantom jack, with no input device; 3. remove HDA jack get_unique_index() and index related code. Changes in v7: 1. move name generating and index getting part into ctljack.c; 2. remove exposing private_data and destructor to hda, then jack core can handle kctls by itself totally. 3. some small code fixing. Changes in v6: 1. refine kctl name generating function; 2. integrate HDA jack kctl more deeply, support phantom jack in snd_jack_new(); 3. add documentation for Jack kcontrols to explain how to use it. Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. *** BLURB HERE *** Jie Yang (7): ALSA: jack: implement kctl creating for jack device ALSA: Jack: refactoring snd_kctl_jack_new to support embedded kctl ALSA: jack: extend snd_jack_new to support phantom jack ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove exporting ctljack functions ALSA: Docs: Add documentation for Jack kcontrols Documentation/sound/alsa/Jack-Controls.txt | 48 ++++++++++ include/sound/control.h | 2 +- include/sound/jack.h | 19 +++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 41 +++++++-- sound/core/jack.c | 142 ++++++++++++++++++++++++++--- sound/pci/hda/Kconfig | 1 - sound/pci/hda/hda_jack.c | 90 +++++------------- sound/pci/hda/hda_jack.h | 5 +- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 13 files changed, 260 insertions(+), 101 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt -- 1.9.1

3 18

[alsa-devel] [RFC 1/4] ASoC: topology: Add topology UAPI header.
by Liam Girdwood 22 Apr '15

22 Apr '15

The ASoC topology UAPI header defines the structures required to define any DSP firmware audio topology and control objects from userspace. The following objects are supported :- o kcontrols including TLV controls. o DAPM widgets and graph elements o Vendor bespoke objects. o Coefficient data o FE PCM capabilities and config. o BE link capabilities and config. o Codec <-> codec link capabilities and config. o Topology object manifest. The file format is simple and divided into blocks for each object type and each block has a header that defines it's size and type. Blocks can be in any order of type and can either all be in a single file or spread across more than one file. Blocks also have a group identifier ID so that they can be loaded and unloaded by ID. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-dapm.h | 33 +--- include/uapi/sound/asoc.h | 420 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 421 insertions(+), 32 deletions(-) create mode 100644 include/uapi/sound/asoc.h diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index b1ec05b..3263e36 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -15,6 +15,7 @@ #include <linux/types.h> #include <sound/control.h> +#include <sound/asoc.h> struct device; @@ -447,38 +448,6 @@ struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol) struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( struct snd_kcontrol *kcontrol); -/* dapm widget types */ -enum snd_soc_dapm_type { - snd_soc_dapm_input = 0, /* input pin */ - snd_soc_dapm_output, /* output pin */ - snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */ - snd_soc_dapm_mixer, /* mixes several analog signals together */ - snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */ - snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */ - snd_soc_dapm_out_drv, /* output driver */ - snd_soc_dapm_adc, /* analog to digital converter */ - snd_soc_dapm_dac, /* digital to analog converter */ - snd_soc_dapm_micbias, /* microphone bias (power) */ - snd_soc_dapm_mic, /* microphone */ - snd_soc_dapm_hp, /* headphones */ - snd_soc_dapm_spk, /* speaker */ - snd_soc_dapm_line, /* line input/output */ - snd_soc_dapm_switch, /* analog switch */ - snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ - snd_soc_dapm_pre, /* machine specific pre widget - exec first */ - snd_soc_dapm_post, /* machine specific post widget - exec last */ - snd_soc_dapm_supply, /* power/clock supply */ - snd_soc_dapm_regulator_supply, /* external regulator */ - snd_soc_dapm_clock_supply, /* external clock */ - snd_soc_dapm_aif_in, /* audio interface input */ - snd_soc_dapm_aif_out, /* audio interface output */ - snd_soc_dapm_siggen, /* signal generator */ - snd_soc_dapm_dai_in, /* link to DAI structure */ - snd_soc_dapm_dai_out, - snd_soc_dapm_dai_link, /* link between two DAI structures */ - snd_soc_dapm_kcontrol, /* Auto-disabled kcontrol */ -}; - enum snd_soc_dapm_subclass { SND_SOC_DAPM_CLASS_INIT = 0, SND_SOC_DAPM_CLASS_RUNTIME = 1, diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h new file mode 100644 index 0000000..dde7133 --- /dev/null +++ b/include/uapi/sound/asoc.h @@ -0,0 +1,420 @@ +/* + * uapi/sound/asoc.h -- ALSA SoC Firmware Controls and DAPM + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * 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. + * + * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, + * algorithms, equalisers, DAIs, widgets etc. +*/ + +#ifndef __LINUX_UAPI_SND_ASOC_H +#define __LINUX_UAPI_SND_ASOC_H + +#include <linux/types.h> +#include <sound/asound.h> + +/* + * Numeric IDs for stock mixer types that are used to map and enumerate FW + * based mixers. + */ +#define SOC_CONTROL_ID_PUT(p) ((p & 0xff) << 16) +#define SOC_CONTROL_ID_GET(g) ((g & 0xff) << 8) +#define SOC_CONTROL_ID_INFO(i) ((i & 0xff) << 0) +#define SOC_CONTROL_ID(g, p, i) \ + (SOC_CONTROL_ID_PUT(p) | SOC_CONTROL_ID_GET(g) |\ + SOC_CONTROL_ID_INFO(i)) + +#define SOC_CONTROL_GET_ID_PUT(id) ((id & 0xff0000) >> 16) +#define SOC_CONTROL_GET_ID_GET(id) ((id & 0x00ff00) >> 8) +#define SOC_CONTROL_GET_ID_INFO(id) ((id & 0x0000ff) >> 0) + +/* individual kcontrol info types - can be mixed with other types */ +#define SOC_CONTROL_TYPE_EXT 0 /* driver defined */ +#define SOC_CONTROL_TYPE_VOLSW 1 +#define SOC_CONTROL_TYPE_VOLSW_SX 2 +#define SOC_CONTROL_TYPE_VOLSW_S8 3 +#define SOC_CONTROL_TYPE_VOLSW_XR_SX 4 +#define SOC_CONTROL_TYPE_ENUM 6 +#define SOC_CONTROL_TYPE_ENUM_EXT 7 +#define SOC_CONTROL_TYPE_BYTES 8 +#define SOC_CONTROL_TYPE_BOOL_EXT 9 +#define SOC_CONTROL_TYPE_ENUM_VALUE 10 +#define SOC_CONTROL_TYPE_RANGE 11 +#define SOC_CONTROL_TYPE_STROBE 12 +#define SOC_CONTROL_TYPE_BYTES_EXT 13 +#define SOC_CONTROL_TYPE_VOLSW_EXT 14 + +/* convenience macros for compound control type mappings */ +#define SOC_CONTROL_IO_VOLSW \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW, \ + SOC_CONTROL_TYPE_VOLSW, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_VOLSW_SX \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_SX, \ + SOC_CONTROL_TYPE_VOLSW_SX, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_VOLSW_S8 \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_S8, \ + SOC_CONTROL_TYPE_VOLSW_S8, \ + SOC_CONTROL_TYPE_VOLSW_S8) +#define SOC_CONTROL_IO_VOLSW_XR_SX \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_VOLSW_XR_SX, \ + SOC_CONTROL_TYPE_VOLSW_XR_SX, \ + SOC_CONTROL_TYPE_VOLSW_XR_SX) +#define SOC_CONTROL_IO_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_VOLSW) +#define SOC_CONTROL_IO_ENUM \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_ENUM, \ + SOC_CONTROL_TYPE_ENUM, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_CONTROL_IO_ENUM_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_ENUM_EXT) +#define SOC_CONTROL_IO_BYTES \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_BYTES, \ + SOC_CONTROL_TYPE_BYTES, \ + SOC_CONTROL_TYPE_BYTES) +#define SOC_CONTROL_IO_BOOL_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_BOOL_EXT) +#define SOC_CONTROL_IO_ENUM_VALUE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_ENUM_VALUE, \ + SOC_CONTROL_TYPE_ENUM_VALUE, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_CONTROL_IO_RANGE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_RANGE, \ + SOC_CONTROL_TYPE_RANGE, \ + SOC_CONTROL_TYPE_RANGE) +#define SOC_CONTROL_IO_STROBE \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_STROBE, \ + SOC_CONTROL_TYPE_STROBE, \ + SOC_CONTROL_TYPE_STROBE) +#define SOC_CONTROL_IO_BYTES_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_BYTES_EXT) +#define SOC_CONTROL_IO_VOLSW_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_VOLSW) + +/* individual widget kcontrol info types - can be mixed with other types */ +#define SOC_DAPM_TYPE_VOLSW 64 +#define SOC_DAPM_TYPE_ENUM_DOUBLE 65 +#define SOC_DAPM_TYPE_ENUM_VIRT 66 +#define SOC_DAPM_TYPE_ENUM_VALUE 67 +#define SOC_DAPM_TYPE_PIN 68 +#define SOC_DAPM_TYPE_ENUM_EXT 69 + +/* convenience macros for compound widget kcontrol type mappings */ +#define SOC_DAPM_IO_VOLSW \ + SOC_CONTROL_ID(SOC_DAPM_TYPE_VOLSW, \ + SOC_DAPM_TYPE_VOLSW, \ + SOC_DAPM_TYPE_VOLSW) +#define SOC_DAPM_IO_ENUM_DOUBLE \ + SOC_CONTROL_ID(SOC_DAPM_TYPE_ENUM_DOUBLE, \ + SOC_DAPM_TYPE_ENUM_DOUBLE, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_DAPM_IO_ENUM_VIRT \ + SOC_CONTROL_ID(SOC_DAPM_TYPE_ENUM_VIRT, \ + SOC_DAPM_TYPE_ENUM_VIRT, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_DAPM_IO_ENUM_VALUE \ + SOC_CONTROL_ID(SOC_DAPM_TYPE_ENUM_VALUE, \ + SOC_DAPM_TYPE_ENUM_VALUE, \ + SOC_CONTROL_TYPE_ENUM) +#define SOC_DAPM_IO_PIN \ + SOC_CONTROL_ID(SOC_DAPM_TYPE_PIN, \ + SOC_DAPM_TYPE_PIN, \ + SOC_DAPM_TYPE_PIN) +#define SOC_DAPM_IO_ENUM_EXT \ + SOC_CONTROL_ID(SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_EXT, \ + SOC_CONTROL_TYPE_ENUM) + +/* dapm widget types */ +enum snd_soc_dapm_type { + snd_soc_dapm_input = 0, /* input pin */ + snd_soc_dapm_output, /* output pin */ + snd_soc_dapm_mux, /* selects 1 analog signal from many inputs */ + snd_soc_dapm_mixer, /* mixes several analog signals together */ + snd_soc_dapm_mixer_named_ctl, /* mixer with named controls */ + snd_soc_dapm_pga, /* programmable gain/attenuation (volume) */ + snd_soc_dapm_out_drv, /* output driver */ + snd_soc_dapm_adc, /* analog to digital converter */ + snd_soc_dapm_dac, /* digital to analog converter */ + snd_soc_dapm_micbias, /* microphone bias (power) */ + snd_soc_dapm_mic, /* microphone */ + snd_soc_dapm_hp, /* headphones */ + snd_soc_dapm_spk, /* speaker */ + snd_soc_dapm_line, /* line input/output */ + snd_soc_dapm_switch, /* analog switch */ + snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ + snd_soc_dapm_pre, /* machine specific pre widget - exec first */ + snd_soc_dapm_post, /* machine specific post widget - exec last */ + snd_soc_dapm_supply, /* power/clock supply */ + snd_soc_dapm_regulator_supply, /* external regulator */ + snd_soc_dapm_clock_supply, /* external clock */ + snd_soc_dapm_aif_in, /* audio interface input */ + snd_soc_dapm_aif_out, /* audio interface output */ + snd_soc_dapm_siggen, /* signal generator */ + snd_soc_dapm_dai_in, /* link to DAI structure */ + snd_soc_dapm_dai_out, + snd_soc_dapm_dai_link, /* link between two DAI structures */ + snd_soc_dapm_kcontrol, /* Auto-disabled kcontrol */ +}; + +/* Header magic number and string sizes */ +#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ + +/* string sizes */ +#define SND_SOC_TPLG_NUM_TEXTS 16 + +/* ABI version */ +#define SND_SOC_TPLG_ABI_VERSION 0x2 + +/* + * File and Block header data types. + * Add new generic and vendor types to end of list. + * Generic types are handled by the core whilst vendors types are passed + * to the component drivers for handling. + */ +#define SND_SOC_TPLG_MIXER 1 +#define SND_SOC_TPLG_DAPM_GRAPH 2 +#define SND_SOC_TPLG_DAPM_WIDGET 3 +#define SND_SOC_TPLG_DAI_LINK 4 +#define SND_SOC_TPLG_PCM 5 +#define SND_SOC_TPLG_MANIFEST 6 +#define SND_SOC_TPLG_CODEC_LINK 7 +#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_CODEC_LINK + +/* vendor block IDs - please add new vendor types to end */ +#define SND_SOC_TPLG_VENDOR_FW 1000 +#define SND_SOC_TPLG_VENDOR_CONFIG 1001 +#define SND_SOC_TPLG_VENDOR_COEFF 1002 +#define SND_SOC_TPLG_VENDOR_CODEC 1003 + +/* + * File and Block Header. + * This header preceeds all object and object arrays below. + */ +struct snd_soc_tplg_hdr { + __le32 magic; + __le32 abi; /* ABI version */ + __le32 version; /* optional vendor specific version details */ + __le32 type; /* SND_SOC_TPLG_ */ + __le32 vendor_type; /* optional vendor specific type info */ + __le32 size; /* data bytes, excluding this header */ + __le32 id; /* identifier for block */ + char reserved[128]; +} __attribute__((packed)); + +/* + * Manifest. List totals for each payload type. Not used in parsing, but will + * be passed to the component driver before any other objects in order for any + * global componnent resource allocations. + */ +struct snd_soc_tplg_manifest { + __le32 control_elems; /* number of control elements */ + __le32 widget_elems; /* number of widget elements */ + __le32 graph_elems; /* number of graph elements */ + __le32 dai_elems; /* number of DAI elements */ + __le32 dai_link_elems; /* number of DAI link elements */ + char reserved[128]; +} __attribute__((packed)); + +/* + * Element Header. Defines number of elements in an object array. + * This prceeeds al mixers, widgets, graph elems, BEs, FEs, CC links. + */ +struct snd_soc_tplg_elems { + __le32 count; /* number of elements */ + /* elements start here */ +} __attribute__((packed)); + +/* + * Private data. + * All topology objects may have private data that can be used by the driver or + * firmware. Core will ignore this data. + */ +struct snd_soc_tplg_private { + __le32 length; + char data[0]; +} __attribute__((packed)); + +/* + * Kcontrol TLV data. + */ +struct snd_soc_tplg_ctl_tlv { + __le32 numid; /* control element numeric identification */ + __le32 length; /* in bytes aligned to 4 */ + char reserved[16]; + /* tlv data starts here */ +} __attribute__((packed)); + +/* + * kcontrol header + */ +struct snd_soc_tplg_control_hdr { + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 index; + __le32 access; + __le32 tlv_size; + char reserved[16]; +} __attribute__((packed)); + +/* + * Mixer kcontrol. + */ +struct snd_soc_tplg_mixer_control { + struct snd_soc_tplg_control_hdr hdr; + __le32 min; + __le32 max; + __le32 platform_max; + __le32 reg; + __le32 rreg; + __le32 shift; + __le32 rshift; + __le32 invert; + char reserved[64]; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Enumerated kcontrol + */ +struct snd_soc_tplg_enum_control { + struct snd_soc_tplg_control_hdr hdr; + __le32 reg; + __le32 shift_l; + __le32 shift_r; + __le32 items; + __le32 mask; + __le32 count; + char reserved[64]; + char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4]; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Bytes kcontrol + */ +struct snd_soc_tplg_bytes_ext { + struct snd_soc_tplg_control_hdr hdr; + __le32 max; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * DAPM Graph Element + */ +struct snd_soc_tplg_dapm_graph_elem { + char sink[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char control[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char source[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; +} __attribute__((packed)); + +/* + * DAPM Widget. + */ +struct snd_soc_tplg_dapm_widget { + __le32 id; /* snd_soc_dapm_type */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char sname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + __le32 reg; /* negative reg = no direct dapm */ + __le32 shift; /* bits to shift */ + __le32 mask; /* non-shifted mask */ + __u32 invert; /* invert the power bit */ + __u32 ignore_suspend; /* kept enabled over suspend */ + __u16 event_flags; + __u16 event_type; + __u16 num_kcontrols; + char reserved[64]; + struct snd_soc_tplg_private priv; + /* + * kcontrols that relate to this widget + * follow here after widget private data + */ +} __attribute__((packed)); + +/* + * Coefficient File Data. + */ +struct snd_soc_file_coeff_data { + __le32 count; /* in elems */ + __le32 size; /* total data size */ + __le32 id; /* associated mixer ID */ + char reserved[16]; + /* data here */ +} __attribute__((packed)); + +/* + * Stream Capabilities + */ +struct snd_soc_tplg_stream_caps { + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */ + __le32 rates; /* supported rates SNDRV_PCM_RATE_* */ + __le32 rate_min; /* min rate */ + __le32 rate_max; /* max rate */ + __le32 channels_min; /* min channels */ + __le32 channels_max; /* max channels */ + __le32 periods_min; /* min number of periods */ + __le32 periods_max; /* max number of periods */ + __le32 period_size_min; /* min period size bytes */ + __le32 period_size_max; /* max period size bytes */ + __le32 buffer_size_min; /* min buffer size bytes */ + __le32 buffer_size_max; /* max buffer size bytes */ + char reserved[64]; +} __attribute__((packed)); + +/* + * FE or BE Stream configuration supported by SW/FW + */ +struct snd_soc_tplg_stream { + __le64 format; /* SNDRV_PCM_FMTBIT_* */ + __le32 rate; /* SNDRV_PCM_RATE_* */ + __le32 period_bytes; /* size of period in bytes */ + __le32 buffer_bytes; /* size of buffer in bytes */ + __le32 channels; /* channels */ + __le32 tdm_slot; /* optional BE bitmask of supported TDM slots */ + __le32 dai_fmt; /* SND_SOC_DAIFMT_ */ + char reserved[16]; +} __attribute__((packed)); + +/* + * Duplex stream configuration supported by SW/FW. + */ +struct snd_soc_tplg_stream_config { + struct snd_soc_tplg_stream playback; + struct snd_soc_tplg_stream capture; + char reserved[16]; +} __attribute__((packed)); + +/* + * Describes SW/FW specific features of PCM or DAI link. + */ +struct snd_soc_tplg_pcm_dai { + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 id; /* unique BE ID - used to match */ + __le32 playback; /* supports playback in DPCM mode */ + __le32 capture; /* supports capture in DPCM mode */ + __le32 compress; /* 1 = compressed; 0 = PCM */ + __le32 num_configs; /* number of configs */ + char reserved[64]; + struct snd_soc_tplg_stream_caps caps[2]; /* capabilities */ + struct snd_soc_tplg_stream_config config[0]; /* supported SW/FW configs */ +}__attribute__((packed)); + +#endif -- 2.1.0

4 14

[alsa-devel] [PATCH 1/2] ASoC: rt5645: Adds push button support for rt5650
by Bard Liao 22 Apr '15

22 Apr '15

rt5650 support headset button detection. Currently, the button detection is only implemented for rt5650 codec. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 262 +++++++++++++++++++++++++++++++++++++++------- sound/soc/codecs/rt5645.h | 8 +- 2 files changed, 231 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 69528ae..7c59f9c 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -198,7 +198,6 @@ static const struct reg_default rt5645_reg[] = { { 0xda, 0x0000 }, { 0xdb, 0x0003 }, { 0xdc, 0x0049 }, - { 0xdd, 0x001b }, { 0xdf, 0x0008 }, { 0xe0, 0x4000 }, { 0xe6, 0x8000 }, @@ -2368,6 +2367,8 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int rt5645_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + switch (level) { case SND_SOC_BIAS_PREPARE: if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) { @@ -2398,8 +2399,9 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100); - snd_soc_update_bits(codec, RT5645_GEN_CTRL1, - RT5645_DIG_GATE_CTRL, 0); + if (!rt5645->en_button_func) + snd_soc_update_bits(codec, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, 0); snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2 | @@ -2414,28 +2416,71 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int rt5645_jack_detect(struct snd_soc_codec *codec) +static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec, + bool enable) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); - int gpio_state, jack_type = 0; - unsigned int val; - if (!gpio_is_valid(rt5645->pdata.hp_det_gpio)) { - dev_err(codec->dev, "invalid gpio\n"); - return -EINVAL; + if (enable) { + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "ADC R power"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); + snd_soc_update_bits(codec, + RT5645_INT_IRQ_ST, 0x8, 0x8); + snd_soc_update_bits(codec, + RT5650_4BTN_IL_CMD2, 0x8000, 0x8000); + snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("%s read %x = %x\n", __func__, RT5650_4BTN_IL_CMD1, + snd_soc_read(codec, RT5650_4BTN_IL_CMD1)); + } else { + snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0); + snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC L power"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "ADC R power"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "LDO2"); + snd_soc_dapm_disable_pin_unlocked(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync_unlocked(&codec->dapm); } - gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); +} - dev_dbg(codec->dev, "gpio = %d(%d)\n", rt5645->pdata.hp_det_gpio, - gpio_state); +static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + unsigned int val; - if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || - (!rt5645->pdata.gpio_hp_det_active_high && !gpio_state)) { - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "micbias2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_force_enable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (jack_insert) { + if (codec->component.card->instantiated) { + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias1"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "micbias2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "LDO2"); + snd_soc_dapm_force_enable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + /* Power up necessary bits for JD if dapm is + not ready yet */ + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, + RT5645_PWR_MB1 | RT5645_PWR_MB2); + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, RT5645_PWR_LDO2); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, RT5645_PWR_MIC_DET); + } snd_soc_write(codec, RT5645_IN1_CTRL1, 0x0006); snd_soc_write(codec, RT5645_JD_CTRL3, 0x00b0); @@ -2449,32 +2494,62 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec) val = snd_soc_read(codec, RT5645_IN1_CTRL3) & 0x7; dev_dbg(codec->dev, "val = %d\n", val); - if (val == 1 || val == 2) - jack_type = SND_JACK_HEADSET; - else - jack_type = SND_JACK_HEADPHONE; + if (codec->component.card->instantiated) { + snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); + snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); + if (rt5645->pdata.jd_mode == 0) + snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); + snd_soc_dapm_disable_pin(&codec->dapm, + "Mic Det Power"); + snd_soc_dapm_sync(&codec->dapm); + } else { + snd_soc_update_bits(codec, RT5645_PWR_ANLG2, + RT5645_PWR_MB1 | RT5645_PWR_MB2, 0); + if (rt5645->pdata.jd_mode == 0) + snd_soc_update_bits(codec, RT5645_PWR_MIXER, + RT5645_PWR_LDO2, 0); + snd_soc_update_bits(codec, RT5645_PWR_VOL, + RT5645_PWR_MIC_DET, 0); + } - snd_soc_dapm_disable_pin(&codec->dapm, "micbias1"); - snd_soc_dapm_disable_pin(&codec->dapm, "micbias2"); - if (rt5645->pdata.jd_mode == 0) - snd_soc_dapm_disable_pin(&codec->dapm, "LDO2"); - snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power"); - snd_soc_dapm_sync(&codec->dapm); + if (val == 1 || val == 2) { + rt5645->jack_type = SND_JACK_HEADSET; + if (rt5645->en_button_func) { + msleep(100); + rt5645_enable_push_button_irq(codec, true); + } + } else { + rt5645->jack_type = SND_JACK_HEADPHONE; + } + + } else { /* jack out */ + rt5645->jack_type = 0; + if (rt5645->en_button_func) + rt5645_enable_push_button_irq(codec, false); } - snd_soc_jack_report(rt5645->hp_jack, jack_type, SND_JACK_HEADPHONE); - snd_soc_jack_report(rt5645->mic_jack, jack_type, SND_JACK_MICROPHONE); - return 0; + return rt5645->jack_type; } int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack) + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); rt5645->hp_jack = hp_jack; rt5645->mic_jack = mic_jack; - rt5645_jack_detect(codec); + rt5645->btn_jack = btn_jack; + if (rt5645->btn_jack && rt5645->codec_type == CODEC_TYPE_RT5650) { + rt5645->en_button_func = true; + regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, + RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ); + regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1, + RT5645_HP_CB_MASK, RT5645_HP_CB_PU); + regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1, + RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); + } + rt5645_irq_detection(rt5645); return 0; } @@ -2485,7 +2560,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) struct rt5645_priv *rt5645 = container_of(work, struct rt5645_priv, jack_detect_work.work); - rt5645_jack_detect(rt5645->codec); + rt5645_irq_detection(rt5645); } static irqreturn_t rt5645_irq(int irq, void *data) @@ -2498,6 +2573,120 @@ static irqreturn_t rt5645_irq(int irq, void *data) return IRQ_HANDLED; } +static int rt5645_button_detect(struct snd_soc_codec *codec) +{ + int btn_type, val; + + val = snd_soc_read(codec, RT5650_4BTN_IL_CMD1); + pr_debug("val=0x%x\n", val); + btn_type = val & 0xfff0; + snd_soc_write(codec, RT5650_4BTN_IL_CMD1, val); + + return btn_type; +} + +static int rt5645_irq_detection(struct rt5645_priv *rt5645) +{ + int val, btn_type, gpio_state = 0, report = 0; + + switch (rt5645->pdata.jd_mode) { + case 0: /* Not using rt5645 JD */ + if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) { + gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio); + dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n", + rt5645->pdata.hp_det_gpio, gpio_state); + } + if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) || + (!rt5645->pdata.gpio_hp_det_active_high && + !gpio_state)) { + report = rt5645_jack_detect(rt5645->codec, 1); + } else { + report = rt5645_jack_detect(rt5645->codec, 0); + } + snd_soc_jack_report(rt5645->hp_jack, + report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, + report, SND_JACK_MICROPHONE); + return report; + case 1: /* 2 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0070; + break; + default: /* 1 port */ + val = snd_soc_read(rt5645->codec, RT5645_A_JD_CTRL1) & 0x0020; + break; + + } + + switch (val) { + /* jack in */ + case 0x30: /* 2 port */ + case 0x0: /* 1 port or 2 port */ + if (rt5645->jack_type == 0) { + report = rt5645_jack_detect(rt5645->codec, 1); + /* for push button and jack out */ + break; + } + btn_type = 0; + if (snd_soc_read(rt5645->codec, RT5645_INT_IRQ_ST) & 0x4) { + /* button pressed */ + report = SND_JACK_HEADSET; + btn_type = rt5645_button_detect(rt5645->codec); + switch (btn_type) { + case 0x8000: + case 0x4000: + case 0x2000: + report |= SND_JACK_BTN_0; + break; + case 0x1000: + case 0x0800: + case 0x0400: + report |= SND_JACK_BTN_1; + break; + case 0x0200: + case 0x0100: + case 0x0080: + report |= SND_JACK_BTN_2; + break; + case 0x0040: + case 0x0020: + case 0x0010: + report |= SND_JACK_BTN_3; + break; + case 0x0000: /* unpressed */ + break; + default: + dev_err(rt5645->codec->dev, + "Unexpected button code 0x%04x\n", + btn_type); + break; + } + } + if (btn_type == 0)/* button release */ + report = rt5645->jack_type; + + break; + /* jack out */ + case 0x70: /* 2 port */ + case 0x10: /* 2 port */ + case 0x20: /* 1 port */ + report = 0; + snd_soc_update_bits(rt5645->codec, + RT5645_INT_IRQ_ST, 0x1, 0x0); + rt5645_jack_detect(rt5645->codec, 0); + break; + default: + break; + } + + snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); + if (rt5645->en_button_func) + snd_soc_jack_report(rt5645->btn_jack, + report, SND_JACK_MICROPHONE); + + return report; +} + static int rt5645_probe(struct snd_soc_codec *codec) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); @@ -2784,8 +2973,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (rt5645->pdata.en_jd_func) { regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL3, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU, - RT5645_IRQ_CLK_GATE_CTRL | RT5645_MICINDET_MANU); + RT5645_IRQ_CLK_GATE_CTRL, RT5645_IRQ_CLK_GATE_CTRL); regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, RT5645_CBJ_BST1_EN, RT5645_CBJ_BST1_EN); regmap_update_bits(rt5645->regmap, RT5645_JD_CTRL3, diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index db78e94..4473636 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2184,6 +2184,7 @@ struct rt5645_priv { struct i2c_client *i2c; struct snd_soc_jack *hp_jack; struct snd_soc_jack *mic_jack; + struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; int codec_type; @@ -2196,9 +2197,12 @@ struct rt5645_priv { int pll_src; int pll_in; int pll_out; + + int jack_type; + bool en_button_func; }; int rt5645_set_jack_detect(struct snd_soc_codec *codec, - struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack); - + struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack, + struct snd_soc_jack *btn_jack); #endif /* __RT5645_H__ */ -- 1.8.1.1.439.g50a6b54

2 7

[alsa-devel] [PATCH 0/2] Calculate BCLK using TDM slots and remove channels rule
by Jyri Sarha 22 Apr '15

22 Apr '15

The first patch is a bugfix. I did not have the HW see the problem myself, but reading from the code the problem is evident. This should also fix Dan Carpenter's concern about stack usage in davinci_mcasp_hw_rule_channels(), as the whole function is removed. The second patch is just an optimization of the sample-rate rule. In effect I put in use Takashi Iwai's suggestion for fixing the stack usage issue in the channels rule. Jyri Sarha (2): ASoC: davinci-mcasp: Calculate BCLK using TDM slots and remove channels rule ASoC: davinci-macsp: Optimize implicit BLCK sample-rate rule sound/soc/davinci/davinci-mcasp.c | 104 ++++++++++---------------------------- 1 file changed, 27 insertions(+), 77 deletions(-) -- 1.9.1

2 4

[alsa-devel] [PATCH v7 0/7] ALSA: jack: Refactoring for jack kctls
by Jie Yang 22 Apr '15

22 Apr '15

Currently only hda will create kctls for hda jacks, for asoc, people may need create jack kctls in specific driver. Here we are introducing kctls for each jack, by creating kctls and add them to jack controls list (considering exist of combo jack). At the same time, we will report events for each control in the list. With this new implementation, both HDA and soc jack kctls works fine, they are compatible for old HDA jack kctls, too. For soc, a. snd_jack_new() with NULL jack_kctl; b. for each pin, call snd_jack_add_kctls() to add one kctl(it will call snd_ctl_add() to add kctl to card); For HDA, With snd_jack_new(), we can use phantom_jack = true for phantom jack creating, and the jack kctl pointer will be filled with the new created kcontrol. Changes in v7: 1. move name generating and index getting part into ctljack.c; 2. remove exposing private_data and destructor to hda, then jack core can handle kctls by itself totally. 3. some small code fixing. Changes in v6: 1. refine kctl name generating function; 2. integrate HDA jack kctl more deeply, support phantom jack in snd_jack_new(); 3. add documentation for Jack kcontrols to explain how to use it. Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. Jie Yang (7): ALSA: jack: implement kctl creating for jack device ALSA: Jack: refactoring snd_kctl_jack_new to support embedded kctl ALSA: jack: extend snd_jack_new to support phantom jack ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove exporting ctljack functions ALSA: Docs: Add documentation for Jack kcontrols Documentation/sound/alsa/Jack-Controls.txt | 48 +++++++++ include/sound/control.h | 2 +- include/sound/jack.h | 19 +++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 41 ++++++-- sound/core/jack.c | 156 +++++++++++++++++++++++++---- sound/pci/hda/Kconfig | 1 - sound/pci/hda/hda_jack.c | 53 ++++------ sound/pci/hda/hda_jack.h | 4 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 12 files changed, 259 insertions(+), 76 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt -- 1.9.1

3 16

[alsa-devel] [RFC 0/4] ASoC DSP topology
by Liam Girdwood 22 Apr '15

22 Apr '15

It's been about 2 years since posting V1 of the ASoC dynamic firmware patches and a lot has changed since then ... This RFC series is being posted instead of a V2 patch series atm since we are still completing some testing on the codebase and developing a new userspace tool. Expect V2 once more testing is completed shortly. ASoC topology (formerly called dynamic firmware) allows audio DSP topology to be defined as part of the firmware package and not hard coded into the driver. This allows DSP vendors to ship multiple different firmwares or firmwares with programmable topologies for different devices (i.e. phones, tablets, TVs) using a single DSP driver. The DSP topology can be contained as part of the firmware file or exist as separate files. The topology core and file format is generic and not tied to any single vendor or device. The topology core consists of kernel and userspace components :- Kernel. The kernel core reads in the topology data and builds the driver capabilities and audio topology based on this data. This includes building the DAPM graph, setting PCM and DAI capabilities, registering kcontrols and registering DAPM widgets. The userspace tool allows the creation of binary DSP FW topology files based on a topology text files. Changes since V1:- o Name changed to ASoC Topology o Structures from soc.h and soc-dapm.h no longer exposed as UAPIs o Moved to component model from codec/platform model. o Added reserved fields in each UAPI structure. o UAPI structures packed and endianess defined for each structure. o Added support for PCM, DAI and codec <-> codec link capabilities. o Added support for client drivers manifests. o Added support for private data for each dynamic object type. o Single list of dynamic objects rather than list of each object type. Liam

4 8

[alsa-devel] [PATCH v2 0/7] ASoC: hda - add ASoC Skylake HD audio driver
by Vinod Koul 22 Apr '15

22 Apr '15

This version incorporates the comments from Takashi & Mark on last RFC series. This also clubs the ASoC HDA wrapper and controller driver to single series. This is based on for ASoC Skylake HD Audio driver and based on Takashi's topic/hda Dropped the based on comments ALSA: hda - add id table support for hdac device/driver ALSA: hda - Add generic helper function to register/unregister driver ALSA: hda - add generic function to unregister all devices on bus Dropped the below patch and add new patch ALSA: hda - add id table support for hdac device/driver Jeeja KP (6): ALSA: hda - add generic functions to set hdac stream params ASoC: hda - add soc hda codec driver wrapper ASoC: hda - add Skylake platform driver ASoC: hda - add Skylake HD audio driver ASoC: hda - enable ASoC Skylake HD audio driver ASoC: hda - added Skylake I2S machine driver Ramesh Babu (1): ALSA: hda - add ASoC device type for hda core include/sound/hdaudio.h | 4 + sound/hda/hdac_stream.c | 31 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 3 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/soc-hda-codec.c | 79 ++++ sound/soc/codecs/soc-hda-codec.h | 43 +++ sound/soc/hda/Kconfig | 43 +++ sound/soc/hda/Makefile | 6 + sound/soc/hda/boards/Makefile | 3 + sound/soc/hda/boards/skl_rt286.c | 313 ++++++++++++++++ sound/soc/hda/hda_skl.c | 748 ++++++++++++++++++++++++++++++++++++++ sound/soc/hda/hda_skl.h | 44 +++ sound/soc/hda/hda_skl_pcm.c | 498 +++++++++++++++++++++++++ 15 files changed, 1819 insertions(+) create mode 100644 sound/soc/codecs/soc-hda-codec.c create mode 100644 sound/soc/codecs/soc-hda-codec.h create mode 100644 sound/soc/hda/Kconfig create mode 100644 sound/soc/hda/Makefile create mode 100644 sound/soc/hda/boards/Makefile create mode 100644 sound/soc/hda/boards/skl_rt286.c create mode 100644 sound/soc/hda/hda_skl.c create mode 100644 sound/soc/hda/hda_skl.h create mode 100644 sound/soc/hda/hda_skl_pcm.c -- 1.7.9.5

3 22

[alsa-devel] [PATCH 1/2] ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN
by Vinod Koul 21 Apr '15

21 Apr '15

we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- include/uapi/sound/asound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 46145a5277fe..a45be6bdcf5b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -864,7 +864,7 @@ struct snd_ctl_elem_id { snd_ctl_elem_iface_t iface; /* interface identifier */ unsigned int device; /* device/client number */ unsigned int subdevice; /* subdevice (substream) number */ - unsigned char name[44]; /* ASCII name of item */ + unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* ASCII name of item */ unsigned int index; /* index of item */ }; -- 1.7.9.5

5 8

[alsa-devel] [PATCH 1/1] usb-audio: Fix audio output on Roland SC-D70 sound module
by Takamichi Horikawa 21 Apr '15

21 Apr '15

Roland SC-D70 reports its device class as vendor specific class and the quirk QUIRK_AUDIO_FIXED_ENDPOINT was used for audio output. In the quirks table the sampling rate was hard-coded to 44100 Hz and therefore not worked when the sound module was in 48000 Hz mode. In this change the quirk is changed to QUIRK_AUDIO_STANDARD_INTERFACE but as the sound module reports incorrect bSubframeSize in its descriptors, additional change is made in format.c to detect it and to override it (which uses the existing code for Edirol SD-90). Tested both when the sound module was in 44100 Hz mode and 48000 Hz mode and both audio input and output. MIDI related part of the driver is not touched. Signed-off-by: Takamichi Horikawa <takamichiho(a)gmail.com> --- sound/usb/format.c | 5 ++++- sound/usb/quirks-table.h | 30 ++---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/sound/usb/format.c b/sound/usb/format.c index 8bcc87c..789d19e 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -79,7 +79,10 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, format = 1 << UAC_FORMAT_TYPE_I_PCM; } if (format & (1 << UAC_FORMAT_TYPE_I_PCM)) { - if (chip->usb_id == USB_ID(0x0582, 0x0016) /* Edirol SD-90 */ && + if (((chip->usb_id == USB_ID(0x0582, 0x0016)) || + /* Edirol SD-90 */ + (chip->usb_id == USB_ID(0x0582, 0x000c))) && + /* Roland SC-D70 */ sample_width == 24 && sample_bytes == 2) sample_bytes = 3; else if (sample_width > sample_bytes * 8) { diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 07f984d..2f6d3e9 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -816,37 +816,11 @@ YAMAHA_DEVICE(0x7010, "UB99"), .data = (const struct snd_usb_audio_quirk[]) { { .ifnum = 0, - .type = QUIRK_AUDIO_FIXED_ENDPOINT, - .data = & (const struct audioformat) { - .formats = SNDRV_PCM_FMTBIT_S24_3LE, - .channels = 2, - .iface = 0, - .altsetting = 1, - .altset_idx = 1, - .attributes = 0, - .endpoint = 0x01, - .ep_attr = 0x01, - .rates = SNDRV_PCM_RATE_CONTINUOUS, - .rate_min = 44100, - .rate_max = 44100, - } + .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = 1, - .type = QUIRK_AUDIO_FIXED_ENDPOINT, - .data = & (const struct audioformat) { - .formats = SNDRV_PCM_FMTBIT_S24_3LE, - .channels = 2, - .iface = 1, - .altsetting = 1, - .altset_idx = 1, - .attributes = 0, - .endpoint = 0x81, - .ep_attr = 0x01, - .rates = SNDRV_PCM_RATE_CONTINUOUS, - .rate_min = 44100, - .rate_max = 44100, - } + .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = 2, -- 2.3.5

2 1

[alsa-devel] Support Dell headset mode for ALC288
by Kailang 21 Apr '15

21 Apr '15

Hi Takashi, Dell has new platform with ALC288. Attach patch is support headset mode for ALC288. Thanks. BR, Kailang

3 10

[alsa-devel] [PATCH] ALSA: hda - only sync BCLK to the display clock for Haswell & Broadwell
by mengdong.lin＠intel.com 21 Apr '15

21 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Only Intel Haswell and Broadwell have a separate HD-A controller (PCI device 3) for display audio, which needs to get 24MHz HD-A link BCLK from the variable display core clock through vendor specific registers EM4 & EM5. Other platforms (Baytrail, Braswell and Skylake) don't have this feature. So a new driver quirk AZX_DCAPS_I915_SYNC_CLK is defined for the HSW/BDW display HD-A controller, to sync clock after the shared display power is restored. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index be1b7de..1729004 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -175,6 +175,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28) /* CORBRP clears itself after reset */ #define AZX_DCAPS_NO_MSI64 (1 << 29) /* Stick to 32-bit MSIs */ #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30) /* capture and playback use separate stream tag */ +#define AZX_DCAPS_I915_SYNC_CLK (1 << 31) /* Need to sync BCLK with display clock */ enum { AZX_SNOOP_TYPE_NONE, diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e1c2105..951263d 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -289,13 +289,13 @@ enum { #define AZX_DCAPS_INTEL_HASWELL \ (/*AZX_DCAPS_ALIGN_BUFSIZE |*/ AZX_DCAPS_COUNT_LPIB_DELAY |\ AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\ - AZX_DCAPS_SNOOP_TYPE(SCH)) + AZX_DCAPS_I915_SYNC_CLK | AZX_DCAPS_SNOOP_TYPE(SCH)) /* Broadwell HDMI can't use position buffer reliably, force to use LPIB */ #define AZX_DCAPS_INTEL_BROADWELL \ (/*AZX_DCAPS_ALIGN_BUFSIZE |*/ AZX_DCAPS_POSFIX_LPIB |\ AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_POWERWELL |\ - AZX_DCAPS_SNOOP_TYPE(SCH)) + AZX_DCAPS_I915_SYNC_CLK | AZX_DCAPS_SNOOP_TYPE(SCH)) #define AZX_DCAPS_INTEL_BRASWELL \ (AZX_DCAPS_INTEL_PCH | AZX_DCAPS_I915_POWERWELL) @@ -815,7 +815,8 @@ static int azx_resume(struct device *dev) if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { hda_display_power(hda, true); - haswell_set_bclk(hda); + if (chip->driver_caps & AZX_DCAPS_I915_SYNC_CLK) + haswell_set_bclk(hda); } if (chip->msi) if (pci_enable_msi(pci) < 0) @@ -884,7 +885,8 @@ static int azx_runtime_resume(struct device *dev) if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { hda_display_power(hda, true); - haswell_set_bclk(hda); + if (chip->driver_caps & AZX_DCAPS_I915_SYNC_CLK) + haswell_set_bclk(hda); } /* Read STATESTS before controller reset */ @@ -1578,7 +1580,7 @@ static int azx_first_init(struct azx *chip) /* initialize chip */ azx_init_pci(chip); - if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { + if (chip->driver_caps & AZX_DCAPS_I915_SYNC_CLK) { struct hda_intel *hda; hda = container_of(chip, struct hda_intel, chip); -- 1.9.1

3 8

[alsa-devel] [PATCH v6 0/6] ALSA: jack: Refactoring for jack kctls
by Jie Yang 21 Apr '15

21 Apr '15

Currently only hda will create kctls for hda jacks, for asoc, people may need create jack kctls in specific driver. Here we are introducing kctls for each jack, by creating kctls and add them to jack controls list (considering exist of combo jack). At the same time, we will report events for each control in the list. With this new implementation, both HDA and soc jack kctls works fine, they are compatible for old HDA jack kctls, too. For soc, a. snd_jack_new() with NULL jack_kctl; b. for each pin, call snd_jack_add_kctls() to add one kctl(it will call snd_ctl_add() to add kctl to card); For HDA, With snd_jack_new(), we can use phantom_jack = true for phantom jack creating, and the jack kctl pointer will be filled with the new created kcontrol. Changes in v6: 1. refine kctl name generating function; 2. integrate HDA jack kctl more deeply, support phantom jack in snd_jack_new(); 3. add documentation for Jack kcontrols to explain how to use it. Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. Jie Yang (6): ALSA: jack: create jack kcontrols for every jack input ALSA: jack: extend snd_jack_new to support phantom jack ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove exporting ctljack functions ALSA: Docs: Add documentation for Jack kcontrols Documentation/sound/alsa/Jack-Controls.txt | 48 +++++++ include/sound/jack.h | 21 +++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 2 - sound/core/jack.c | 193 +++++++++++++++++++++++++---- sound/pci/hda/Kconfig | 1 - sound/pci/hda/hda_jack.c | 57 ++++----- sound/pci/hda/hda_jack.h | 4 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 11 files changed, 264 insertions(+), 73 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt -- 1.9.1

4 12

[alsa-devel] [RFC 4/4] ASoC: topology: Add build support for topology.
by Liam Girdwood 20 Apr '15

20 Apr '15

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- sound/soc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 5b3c8f6..a132768 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,6 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-objs += soc-topology.o ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o -- 2.1.0

2 1

[alsa-devel] [PATCH] ALSA: hda - Mute headphone pin on suspend on XPS13 9333
by Gabriele Mazzotta 20 Apr '15

20 Apr '15

Muting the headphone output pin right before the codec suspension prevents pop noises when headphones are plugged in (except for a barely audible click noise). This solution allows to truly save some power when headphones are plugged in unlike the previous solution (033b0a7ca9c: "ALSA: hda - Pop noises fix for XPS13 9333") Signed-off-by: Gabriele Mazzotta <gabriele.mzt(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b18b9c6..231d0e4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4176,17 +4176,15 @@ static void alc_fixup_disable_aamix(struct hda_codec *codec, } } -static unsigned int alc_power_filter_xps13(struct hda_codec *codec, - hda_nid_t nid, - unsigned int power_state) +static void alc_shutup_dell_xps13(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; + int hp_pin = spec->gen.autocfg.hp_pins[0]; - /* Avoid pop noises when headphones are plugged in */ - if (spec->gen.hp_jack_present) - if (nid == codec->core.afg || nid == 0x02 || nid == 0x15) - return AC_PWRST_D0; - return snd_hda_gen_path_power_filter(codec, nid, power_state); + /* Prevent pop noises when headphones are plugged in */ + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); + msleep(20); } static void alc_fixup_dell_xps13(struct hda_codec *codec, @@ -4197,8 +4195,7 @@ static void alc_fixup_dell_xps13(struct hda_codec *codec, struct hda_input_mux *imux = &spec->gen.input_mux; int i; - spec->shutup = alc_no_shutup; - codec->power_filter = alc_power_filter_xps13; + spec->shutup = alc_shutup_dell_xps13; /* Make the internal mic the default input source. */ for (i = 0; i < imux->num_items; i++) { -- 2.1.4

2 2

[alsa-devel] [PATCH 1/2] ASoC: wm_adsp: Use __leXX for little endian data
by Charles Keepax 20 Apr '15

20 Apr '15

Using uXX for little endian data, was triggering some warnings through sparse: sound/soc/codecs/wm_adsp.c:716:26: sparse: cast to restricted __le16 sound/soc/codecs/wm_adsp.c:736:23: sparse: cast to restricted __le16 sound/soc/codecs/wm_adsp.c:739:23: sparse: cast to restricted __le32 Correct this by changing the casts to use __leXX instead of uXX. Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 00289bf..53fc7f8 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -713,7 +713,7 @@ static int wm_coeff_parse_string(int bytes, const u8 **pos, const u8 **str) length = **pos; break; case 2: - length = le16_to_cpu(*((u16 *)*pos)); + length = le16_to_cpu(*((__le16 *)*pos)); break; default: return 0; @@ -733,10 +733,10 @@ static int wm_coeff_parse_int(int bytes, const u8 **pos) switch (bytes) { case 2: - val = le16_to_cpu(*((u16 *)*pos)); + val = le16_to_cpu(*((__le16 *)*pos)); break; case 4: - val = le32_to_cpu(*((u32 *)*pos)); + val = le32_to_cpu(*((__le32 *)*pos)); break; default: break; -- 1.7.2.5

2 2

[alsa-devel] [PATCH resend] ASoC: adau1701: add regulator consumer support
by pascal.huerst＠gmail.com 20 Apr '15

20 Apr '15

From: Pascal Huerst <pascal.huerst(a)gmail.com> The adau1701 has two power domains, DVDD and AVDD. Enable them both as long as the codec is in use. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> --- .../devicetree/bindings/sound/adi,adau1701.txt | 4 + sound/soc/codecs/adau1701.c | 125 ++++++++++++++++++--- 2 files changed, 114 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,adau1701.txt b/Documentation/devicetree/bindings/sound/adi,adau1701.txt index 547a49b..0d1128c 100644 --- a/Documentation/devicetree/bindings/sound/adi,adau1701.txt +++ b/Documentation/devicetree/bindings/sound/adi,adau1701.txt @@ -20,6 +20,8 @@ Optional properties: pin configurations as described in the datasheet, table 53. Note that the value of this property has to be prefixed with '/bits/ 8'. + - avdd-supply: Power supply for AVDD, providing 3.3V + - dvdd-supply: Power supply for DVDD, providing 3.3V Examples: @@ -28,6 +30,8 @@ Examples: compatible = "adi,adau1701"; reg = <0x34>; reset-gpio = <&gpio 23 0>; + avdd-supply = <&vdd_3v3_reg>; + dvdd-supply = <&vdd_3v3_reg>; adi,pll-mode-gpios = <&gpio 24 0 &gpio 25 0>; adi,pin-config = /bits/ 8 <0x4 0x7 0x5 0x5 0x4 0x4 0x4 0x4 0x4 0x4 0x4 0x4>; diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index d4e219b..ca94ae8 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -16,6 +16,7 @@ #include <linux/of.h> #include <linux/of_gpio.h> #include <linux/of_device.h> +#include <linux/regulator/consumer.h> #include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> @@ -101,6 +102,10 @@ #define ADAU1701_FIRMWARE "adau1701.bin" +static const char * const supply_names[] = { + "dvdd", "avdd" +}; + struct adau1701 { int gpio_nreset; int gpio_pll_mode[2]; @@ -112,6 +117,7 @@ struct adau1701 { u8 pin_config[12]; struct sigmadsp *sigmadsp; + struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; static const struct snd_kcontrol_new adau1701_controls[] = { @@ -669,6 +675,13 @@ static int adau1701_probe(struct snd_soc_codec *codec) if (ret) return ret; + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + /* * Let the pll_clkdiv variable default to something that won't happen * at runtime. That way, we can postpone the firmware download from @@ -680,7 +693,7 @@ static int adau1701_probe(struct snd_soc_codec *codec) /* initalize with pre-configured pll mode settings */ ret = adau1701_reset(codec, adau1701->pll_clkdiv, 0); if (ret < 0) - return ret; + goto exit_regulators_disable; /* set up pin config */ val = 0; @@ -696,10 +709,60 @@ static int adau1701_probe(struct snd_soc_codec *codec) regmap_write(adau1701->regmap, ADAU1701_PINCONF_1, val); return 0; + +exit_regulators_disable: + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); + return ret; } +static int adau1701_remove(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + + if (gpio_is_valid(adau1701->gpio_nreset)) + gpio_set_value_cansleep(adau1701->gpio_nreset, 0); + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); + + return 0; +} + +#ifdef CONFIG_PM +static int adau1701_suspend(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + + return 0; +} + +static int adau1701_resume(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + int ret; + + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + + return adau1701_reset(codec, adau1701->pll_clkdiv, 0); +} +#else +#define adau1701_resume NULL +#define adau1701_suspend NULL +#endif /* CONFIG_PM */ + static struct snd_soc_codec_driver adau1701_codec_drv = { .probe = adau1701_probe, + .remove = adau1701_remove, + .resume = adau1701_resume, + .suspend = adau1701_suspend, .set_bias_level = adau1701_set_bias_level, .idle_bias_off = true, @@ -730,32 +793,58 @@ static int adau1701_i2c_probe(struct i2c_client *client, struct device *dev = &client->dev; int gpio_nreset = -EINVAL; int gpio_pll_mode[2] = { -EINVAL, -EINVAL }; - int ret; + int ret, i; adau1701 = devm_kzalloc(dev, sizeof(*adau1701), GFP_KERNEL); if (!adau1701) return -ENOMEM; + for (i = 0; i < ARRAY_SIZE(supply_names); i++) + adau1701->supplies[i].supply = supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(dev, "Failed to get regulators: %d\n", ret); + return ret; + } + + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + adau1701->client = client; adau1701->regmap = devm_regmap_init(dev, NULL, client, &adau1701_regmap); - if (IS_ERR(adau1701->regmap)) - return PTR_ERR(adau1701->regmap); + if (IS_ERR(adau1701->regmap)) { + ret = PTR_ERR(adau1701->regmap); + goto exit_regulators_disable; + } + if (dev->of_node) { gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0); - if (gpio_nreset < 0 && gpio_nreset != -ENOENT) - return gpio_nreset; + if (gpio_nreset < 0 && gpio_nreset != -ENOENT) { + ret = gpio_nreset; + goto exit_regulators_disable; + } gpio_pll_mode[0] = of_get_named_gpio(dev->of_node, "adi,pll-mode-gpios", 0); - if (gpio_pll_mode[0] < 0 && gpio_pll_mode[0] != -ENOENT) - return gpio_pll_mode[0]; + if (gpio_pll_mode[0] < 0 && gpio_pll_mode[0] != -ENOENT) { + ret = gpio_pll_mode[0]; + goto exit_regulators_disable; + } gpio_pll_mode[1] = of_get_named_gpio(dev->of_node, "adi,pll-mode-gpios", 1); - if (gpio_pll_mode[1] < 0 && gpio_pll_mode[1] != -ENOENT) - return gpio_pll_mode[1]; + if (gpio_pll_mode[1] < 0 && gpio_pll_mode[1] != -ENOENT) { + ret = gpio_pll_mode[1]; + goto exit_regulators_disable; + } of_property_read_u32(dev->of_node, "adi,pll-clkdiv", &adau1701->pll_clkdiv); @@ -769,7 +858,7 @@ static int adau1701_i2c_probe(struct i2c_client *client, ret = devm_gpio_request_one(dev, gpio_nreset, GPIOF_OUT_INIT_LOW, "ADAU1701 Reset"); if (ret < 0) - return ret; + goto exit_regulators_disable; } if (gpio_is_valid(gpio_pll_mode[0]) && @@ -778,13 +867,13 @@ static int adau1701_i2c_probe(struct i2c_client *client, GPIOF_OUT_INIT_LOW, "ADAU1701 PLL mode 0"); if (ret < 0) - return ret; + goto exit_regulators_disable; ret = devm_gpio_request_one(dev, gpio_pll_mode[1], GPIOF_OUT_INIT_LOW, "ADAU1701 PLL mode 1"); if (ret < 0) - return ret; + goto exit_regulators_disable; } adau1701->gpio_nreset = gpio_nreset; @@ -795,11 +884,17 @@ static int adau1701_i2c_probe(struct i2c_client *client, adau1701->sigmadsp = devm_sigmadsp_init_i2c(client, &adau1701_sigmadsp_ops, ADAU1701_FIRMWARE); - if (IS_ERR(adau1701->sigmadsp)) - return PTR_ERR(adau1701->sigmadsp); + if (IS_ERR(adau1701->sigmadsp)) { + ret = PTR_ERR(adau1701->sigmadsp); + goto exit_regulators_disable; + } ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv, &adau1701_dai, 1); + +exit_regulators_disable: + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); return ret; } -- 1.9.3

3 2

[alsa-devel] [PATCH] ASoC: adau1701: add regulator consumer support
by pascal.huerst＠gmail.com 20 Apr '15

20 Apr '15

From: Pascal Huerst <pascal.huerst(a)gmail.com> The adau1701 has two power domains, DVDD and AVDD. Enable them both as long as the codec is in use. --- .../devicetree/bindings/sound/adi,adau1701.txt | 4 + sound/soc/codecs/adau1701.c | 125 ++++++++++++++++++--- 2 files changed, 114 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,adau1701.txt b/Documentation/devicetree/bindings/sound/adi,adau1701.txt index 547a49b..0d1128c 100644 --- a/Documentation/devicetree/bindings/sound/adi,adau1701.txt +++ b/Documentation/devicetree/bindings/sound/adi,adau1701.txt @@ -20,6 +20,8 @@ Optional properties: pin configurations as described in the datasheet, table 53. Note that the value of this property has to be prefixed with '/bits/ 8'. + - avdd-supply: Power supply for AVDD, providing 3.3V + - dvdd-supply: Power supply for DVDD, providing 3.3V Examples: @@ -28,6 +30,8 @@ Examples: compatible = "adi,adau1701"; reg = <0x34>; reset-gpio = <&gpio 23 0>; + avdd-supply = <&vdd_3v3_reg>; + dvdd-supply = <&vdd_3v3_reg>; adi,pll-mode-gpios = <&gpio 24 0 &gpio 25 0>; adi,pin-config = /bits/ 8 <0x4 0x7 0x5 0x5 0x4 0x4 0x4 0x4 0x4 0x4 0x4 0x4>; diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index d4e219b..ca94ae8 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -16,6 +16,7 @@ #include <linux/of.h> #include <linux/of_gpio.h> #include <linux/of_device.h> +#include <linux/regulator/consumer.h> #include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> @@ -101,6 +102,10 @@ #define ADAU1701_FIRMWARE "adau1701.bin" +static const char * const supply_names[] = { + "dvdd", "avdd" +}; + struct adau1701 { int gpio_nreset; int gpio_pll_mode[2]; @@ -112,6 +117,7 @@ struct adau1701 { u8 pin_config[12]; struct sigmadsp *sigmadsp; + struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; static const struct snd_kcontrol_new adau1701_controls[] = { @@ -669,6 +675,13 @@ static int adau1701_probe(struct snd_soc_codec *codec) if (ret) return ret; + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + /* * Let the pll_clkdiv variable default to something that won't happen * at runtime. That way, we can postpone the firmware download from @@ -680,7 +693,7 @@ static int adau1701_probe(struct snd_soc_codec *codec) /* initalize with pre-configured pll mode settings */ ret = adau1701_reset(codec, adau1701->pll_clkdiv, 0); if (ret < 0) - return ret; + goto exit_regulators_disable; /* set up pin config */ val = 0; @@ -696,10 +709,60 @@ static int adau1701_probe(struct snd_soc_codec *codec) regmap_write(adau1701->regmap, ADAU1701_PINCONF_1, val); return 0; + +exit_regulators_disable: + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); + return ret; } +static int adau1701_remove(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + + if (gpio_is_valid(adau1701->gpio_nreset)) + gpio_set_value_cansleep(adau1701->gpio_nreset, 0); + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); + + return 0; +} + +#ifdef CONFIG_PM +static int adau1701_suspend(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + + return 0; +} + +static int adau1701_resume(struct snd_soc_codec *codec) +{ + struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec); + int ret; + + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + + return adau1701_reset(codec, adau1701->pll_clkdiv, 0); +} +#else +#define adau1701_resume NULL +#define adau1701_suspend NULL +#endif /* CONFIG_PM */ + static struct snd_soc_codec_driver adau1701_codec_drv = { .probe = adau1701_probe, + .remove = adau1701_remove, + .resume = adau1701_resume, + .suspend = adau1701_suspend, .set_bias_level = adau1701_set_bias_level, .idle_bias_off = true, @@ -730,32 +793,58 @@ static int adau1701_i2c_probe(struct i2c_client *client, struct device *dev = &client->dev; int gpio_nreset = -EINVAL; int gpio_pll_mode[2] = { -EINVAL, -EINVAL }; - int ret; + int ret, i; adau1701 = devm_kzalloc(dev, sizeof(*adau1701), GFP_KERNEL); if (!adau1701) return -ENOMEM; + for (i = 0; i < ARRAY_SIZE(supply_names); i++) + adau1701->supplies[i].supply = supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(dev, "Failed to get regulators: %d\n", ret); + return ret; + } + + ret = regulator_bulk_enable(ARRAY_SIZE(adau1701->supplies), + adau1701->supplies); + if (ret < 0) { + dev_err(dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + adau1701->client = client; adau1701->regmap = devm_regmap_init(dev, NULL, client, &adau1701_regmap); - if (IS_ERR(adau1701->regmap)) - return PTR_ERR(adau1701->regmap); + if (IS_ERR(adau1701->regmap)) { + ret = PTR_ERR(adau1701->regmap); + goto exit_regulators_disable; + } + if (dev->of_node) { gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0); - if (gpio_nreset < 0 && gpio_nreset != -ENOENT) - return gpio_nreset; + if (gpio_nreset < 0 && gpio_nreset != -ENOENT) { + ret = gpio_nreset; + goto exit_regulators_disable; + } gpio_pll_mode[0] = of_get_named_gpio(dev->of_node, "adi,pll-mode-gpios", 0); - if (gpio_pll_mode[0] < 0 && gpio_pll_mode[0] != -ENOENT) - return gpio_pll_mode[0]; + if (gpio_pll_mode[0] < 0 && gpio_pll_mode[0] != -ENOENT) { + ret = gpio_pll_mode[0]; + goto exit_regulators_disable; + } gpio_pll_mode[1] = of_get_named_gpio(dev->of_node, "adi,pll-mode-gpios", 1); - if (gpio_pll_mode[1] < 0 && gpio_pll_mode[1] != -ENOENT) - return gpio_pll_mode[1]; + if (gpio_pll_mode[1] < 0 && gpio_pll_mode[1] != -ENOENT) { + ret = gpio_pll_mode[1]; + goto exit_regulators_disable; + } of_property_read_u32(dev->of_node, "adi,pll-clkdiv", &adau1701->pll_clkdiv); @@ -769,7 +858,7 @@ static int adau1701_i2c_probe(struct i2c_client *client, ret = devm_gpio_request_one(dev, gpio_nreset, GPIOF_OUT_INIT_LOW, "ADAU1701 Reset"); if (ret < 0) - return ret; + goto exit_regulators_disable; } if (gpio_is_valid(gpio_pll_mode[0]) && @@ -778,13 +867,13 @@ static int adau1701_i2c_probe(struct i2c_client *client, GPIOF_OUT_INIT_LOW, "ADAU1701 PLL mode 0"); if (ret < 0) - return ret; + goto exit_regulators_disable; ret = devm_gpio_request_one(dev, gpio_pll_mode[1], GPIOF_OUT_INIT_LOW, "ADAU1701 PLL mode 1"); if (ret < 0) - return ret; + goto exit_regulators_disable; } adau1701->gpio_nreset = gpio_nreset; @@ -795,11 +884,17 @@ static int adau1701_i2c_probe(struct i2c_client *client, adau1701->sigmadsp = devm_sigmadsp_init_i2c(client, &adau1701_sigmadsp_ops, ADAU1701_FIRMWARE); - if (IS_ERR(adau1701->sigmadsp)) - return PTR_ERR(adau1701->sigmadsp); + if (IS_ERR(adau1701->sigmadsp)) { + ret = PTR_ERR(adau1701->sigmadsp); + goto exit_regulators_disable; + } ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv, &adau1701_dai, 1); + +exit_regulators_disable: + + regulator_bulk_disable(ARRAY_SIZE(adau1701->supplies), adau1701->supplies); return ret; } -- 1.9.3

3 2

[alsa-devel] [PATCH 00/13] ADSP Firmware Controls Update
by Charles Keepax 20 Apr '15

20 Apr '15

This series of patches starts with a few small clean ups for the ADSP code, and then finally adds support for the rev 1 and 2 firmware file formats. The revision 1 format is in common usage in the field so it is long overdue to get support for that merged to mainline. The revision 2 format is fairly new but is starting to see some deployment as well. There is still more work todo here. The main next step is to add support for arbitary length controls through the TLV binary control feature that was recently added to the kernel. This patch series will truncate any long controls to 512 bytes. Thanks, Charles Charles Keepax (13): ASoC: wm_adsp: Split out adsp1 & 2 setup algorithms ASoC: wm_adsp: Improve variable naming ASoC: wm_adsp: Remove len field from wm_adsp_alg_region ASoC: wm_adsp: Limit firmware control name to ALSA control name size ASoC: wm_adsp: Move temporary control name to the stack ASoC: wm_adsp: Clean up low level control read/write functions ASoC: wm_adsp: Factor out creation of alg_regions ASoC: wm_adsp: Remove private field from wm_coeff_ctl ASoC: wm_adsp: Group all the ALSA control functions together ASoC: wm_adsp: Add basic support for rev 1 firmware file format ASoC: wm_adsp: Add support for DSP control flags ASoC: wm_adsp: Add support for rev 2 firmware file format ASoC: wm_adsp: Warn that firmware file format 0 is depreciated sound/soc/codecs/wm_adsp.c | 1129 +++++++++++++++++++++++++++----------------- sound/soc/codecs/wm_adsp.h | 6 +- sound/soc/codecs/wmfw.h | 44 ++- 3 files changed, 733 insertions(+), 446 deletions(-) -- 1.7.2.5

2 18

[alsa-devel] [PATCH 0/2] Add support for select accessory detect mode to HPDETL or HPDETR
by Inha Song 20 Apr '15

20 Apr '15

This set of patches adds support for select accessory detect mode to HPDETL or HPDETR. Inha Song (2): extcon: arizona: Add support for select accessory detect mode when headphone detection" mfd: arizona: Update DT binding to support hpdet channel Documentation/devicetree/bindings/mfd/arizona.txt | 4 +++ drivers/extcon/extcon-arizona.c | 34 ++++++++++++++++++++--- include/linux/mfd/arizona/pdata.h | 3 ++ 3 files changed, 37 insertions(+), 4 deletions(-) -- 2.0.0.390.gcb682f8

2 7

[alsa-devel] How to correct params_format on DPCM ?
by Kuninori Morimoto 20 Apr '15

20 Apr '15

Hi Mark, Lars, all Now, I'm using DPCM based sound, but FE/BE gets different params format. How to correct it ? This sound can be used both non-DPCM card / DPCM card -- non-DPCM card -- cpu: rsnd codec: ak4642 -- DPCM card -- FE : cpu: rsnd codec: snd-soc-dummy BE : cpu: snd-soc-dummy codec: ak4642 Here, SNDRV_PCM_FMTBIT_S16_LE is always selected on non-DPCM card. This is OK. rsnd: SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE ak4642: SNDRV_PCM_FMTBIT_S16_LE On DPCM card, FE gets S24, BE gets S16 if aplay selects S24 wav. But, FE needs S16, same as non-DPCM card. I know we can fixup BE side via dai_link.be_hw_params_fixup, but this is FE side. It can't use correct sound playback in corrent DPCM card. But, how to solve this issue ?? Best regards --- Kuninori Morimoto

2 7

[alsa-devel] [PATCH] ASoC: add static inline funcs to fix a compiling issue
by Jie Yang 19 Apr '15

19 Apr '15

When CONFIG_PM_SLEEP is not selected, calling funcs snd_soc_suspend and _resume will generate a compiling issue. Here add static inline stub functions to fix it. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/soc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/sound/soc.h b/include/sound/soc.h index 2afdd2e..64041f5 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -387,8 +387,20 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, int snd_soc_register_card(struct snd_soc_card *card); int snd_soc_unregister_card(struct snd_soc_card *card); int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card); +#ifdef CONFIG_PM_SLEEP int snd_soc_suspend(struct device *dev); int snd_soc_resume(struct device *dev); +#else +static inline int snd_soc_suspend(struct device *dev) +{ + return 0; +} + +static inline int snd_soc_resume(struct device *dev) +{ + return 0; +} +#endif int snd_soc_poweroff(struct device *dev); int snd_soc_register_platform(struct device *dev, const struct snd_soc_platform_driver *platform_drv); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: fix a compiling issue
by Jie Yang 19 Apr '15

19 Apr '15

Fix the compiling issue that we don't have snd_soc_suspend/resume() when CONFIG_PM_SLEEP is not defined. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/haswell/sst-haswell-pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c index 23ae040..f84eb14 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -1313,8 +1313,9 @@ static void hsw_pcm_complete(struct device *dev) dev_err(dev, "failed to restore context for PCM %d\n", i); } +#ifdef CONFIG_PM_SLEEP snd_soc_resume(pdata->soc_card->dev); - +#endif err = sst_hsw_dsp_runtime_resume(hsw); if (err < 0) return; @@ -1367,7 +1368,9 @@ static int hsw_pcm_prepare(struct device *dev) sst_hsw_dsp_runtime_sleep(hsw); } +#ifdef CONFIG_PM_SLEEP snd_soc_suspend(pdata->soc_card->dev); +#endif snd_soc_poweroff(pdata->soc_card->dev); pdata->pm_state = HSW_PM_STATE_D3; -- 1.9.1

5 6

[alsa-devel] [PATCH] ASoC: at91sam9g20ek: Automatically disconnect non-connected pins
by Lars-Peter Clausen 18 Apr '15

18 Apr '15

According to the schematics the both LHPOUT and RHPOUT are connected to the external connector. RHPOUT is missing from the DAPM routes, but otherwise they seem to be complete. This patch adds the missing route and then sets the fully_routed flag for the card. This allows to remove all the manual calls to snd_soc_dapm_nc_pin(). Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/atmel/sam9g20_wm8731.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 8de8361..d7469cd 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -95,8 +95,9 @@ static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = { static const struct snd_soc_dapm_route intercon[] = { - /* speaker connected to LHPOUT */ + /* speaker connected to LHPOUT/RHPOUT */ {"Ext Spk", NULL, "LHPOUT"}, + {"Ext Spk", NULL, "RHPOUT"}, /* mic is connected to Mic Jack, with WM8731 Mic Bias */ {"MICIN", NULL, "Mic Bias"}, @@ -108,9 +109,7 @@ static const struct snd_soc_dapm_route intercon[] = { */ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_dapm_context *dapm = &codec->dapm; int ret; printk(KERN_DEBUG @@ -124,10 +123,6 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* not connected */ - snd_soc_dapm_nc_pin(dapm, "RLINEIN"); - snd_soc_dapm_nc_pin(dapm, "LLINEIN"); - #ifndef ENABLE_MIC_INPUT snd_soc_dapm_nc_pin(&rtd->card->dapm, "Int Mic"); #endif @@ -158,6 +153,7 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = { .num_dapm_widgets = ARRAY_SIZE(at91sam9g20ek_dapm_widgets), .dapm_routes = intercon, .num_dapm_routes = ARRAY_SIZE(intercon), + .fully_routed = true, }; static int at91sam9g20ek_audio_probe(struct platform_device *pdev) -- 1.8.0

3 5

Re: [alsa-devel] [PATCH 1/2] ASoC: sgtl5000: Use specific variable for lo_vag
by Mark Brown 18 Apr '15

18 Apr '15

On Thu, Apr 16, 2015 at 02:51:56PM +0200, Alexander Stein wrote: > This is a preparation for calculating lo_vol which needs both vag > and lo_vag. Applied both, thanks.

1 0

[alsa-devel] Understanding Atmel SSC SND_SOC_DAIFMT_CBS_CFS mode
by Angelo Compagnucci 18 Apr '15

18 Apr '15

Hi List, I'm looking for a way to understand how to correctly configure the Atmel SSC dai on a SAMA5D3 to work in master mode with an I2S codec. >From this comment: /* * I2S format, SSC provides BCLK and LRC clocks. * * The SSC transmit and receive clocks are generated * from the MCK divider, and the BCLK signal * is output on the SSC TK line. */ My question is: should be MCK divider configured manually? If yes how? Actually I'm trying to poke around in atmel_ssc_dai and found a way to generate a stable bit clock, but frame clock is not working as expected. Have you any advice on how to set correctly SSC parameters to generate a stable bit clock and frame clock? Any advice? Thank you! -- Profile: http://it.linkedin.com/in/compagnucciangelo

1 0

[alsa-devel] Support for Synchronous Audio
by Anoop Rajan 18 Apr '15

18 Apr '15

Hi All, My self Anoop, an audio frame work developer, but a newbie to linux ALSA. We have requirements to play synchronous multi-room audio with very minimal node to node latency(<100 us).( Node to node latency: How much one speaker is out of sync with other). Right now we have logic in user space to synchronize the audio using time stamps derived from a common clock, but the node to node latency is over 1ms. Though I make sure that I start the PCM from user layer synchronously, the actual I2S out is out of sync(in consistent values ranging from 100 to 1ms). I beleive the un-deterministic path delay from user to ALSA buffer, big ALSA buffer(8k Samples), scheduling variances(high priority/interrupt preemption) all might have added to this increased latency. Rather than fine tuning the above discrepancies , I was thinking about some designs to pass the audio frames with time stamps to kernel layer and to implement some logic in kernel (before pushing to DMA) to present the audio at exact stamped time to have a better node to node latency. Before doing that I was trying to find out what ALSA supports for this requirement and from web could see various comments regarding this (proposal to snd_pcm_start_at()<http://mailman.alsa-project.org/pipermail/alsa-devel/2014-October/082091.ht…>) and further proposed discussions on Audio mini summit, but I couldn't find further information's on it. Would you please guide me. Does ALSA provides some means to achieve minimal Node to Node latency? would you please provide some pointers/documents to me to understand better. Thanks, Anoop

2 3

[alsa-devel] [PATCH] sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
by Alexey Khoroshilov 18 Apr '15

18 Apr '15

A deadlock can be initiated by userspace via ioctl(SNDCTL_SEQ_OUTOFBAND) on /dev/sequencer with TMR_ECHO midi event. In this case the control flow is: sound_ioctl() -> case SND_DEV_SEQ: case SND_DEV_SEQ2: sequencer_ioctl() -> case SNDCTL_SEQ_OUTOFBAND: spin_lock_irqsave(&lock,flags); play_event(); -> case EV_TIMING: seq_timing_event() -> case TMR_ECHO: seq_copy_to_input() -> spin_lock_irqsave(&lock,flags); It seems that spin_lock_irqsave() around play_event() is not necessary, because the only other call location in seq_startplay() makes the call without acquiring spinlock. So, the patch just removes spinlocks around play_event(). By the way, it removes unreachable code in seq_timing_event(), since (seq_mode == SEQ_2) case is handled in the beginning. Compile tested only. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov(a)ispras.ru> --- sound/oss/sequencer.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c index c0eea1dfe90f..f19da4b47c1d 100644 --- a/sound/oss/sequencer.c +++ b/sound/oss/sequencer.c @@ -681,13 +681,8 @@ static int seq_timing_event(unsigned char *event_rec) break; case TMR_ECHO: - if (seq_mode == SEQ_2) - seq_copy_to_input(event_rec, 8); - else - { - parm = (parm << 8 | SEQ_ECHO); - seq_copy_to_input((unsigned char *) &parm, 4); - } + parm = (parm << 8 | SEQ_ECHO); + seq_copy_to_input((unsigned char *) &parm, 4); break; default:; @@ -1324,7 +1319,6 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a int mode = translate_mode(file); struct synth_info inf; struct seq_event_rec event_rec; - unsigned long flags; int __user *p = arg; orig_dev = dev = dev >> 4; @@ -1479,9 +1473,7 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a case SNDCTL_SEQ_OUTOFBAND: if (copy_from_user(&event_rec, arg, sizeof(event_rec))) return -EFAULT; - spin_lock_irqsave(&lock,flags); play_event(event_rec.arr); - spin_unlock_irqrestore(&lock,flags); return 0; case SNDCTL_MIDI_INFO: -- 1.9.1

2 1

Re: [alsa-devel] Lost Interrput on VIA VT1708S
by Raymond Yau 17 Apr '15

17 Apr '15

> > The second opint is what you have an issue with - see "Lost interrupts" in comment #28. > > https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/commit/sound/c… hwptr tracking was replaced by tracepoint This seem to be the reason that you only find those Lost Interrput in the system log https://bugs.freedesktop.org/show_bug.cgi?id=49608#c28 https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/tree/sound/cor…

1 0

[alsa-devel] [PATCH -next] ASoC: Intel: sst_byt: remove kfree for memory allocated with devm_kzalloc
by weiyj_lk＠163.com 17 Apr '15

17 Apr '15

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> It's not necessary to free memory allocated with devm_kzalloc and using kfree leads to a double free. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/baytrail/sst-baytrail-ipc.c b/sound/soc/intel/baytrail/sst-baytrail-ipc.c index 1efb33b..a839dbf 100644 --- a/sound/soc/intel/baytrail/sst-baytrail-ipc.c +++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c @@ -759,7 +759,6 @@ fw_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(byt); return err; }

3 2

[alsa-devel] [patch] ALSA: hda - potential (but unlikely) uninitialized variable
by Dan Carpenter 17 Apr '15

17 Apr '15

This function is a bit unusual because it accepts negative values as "conn_len". It's theoretically possible for both "cache_len" and "conn_len" to be -ENOSPC and in that case we would oops trying to run memcmp() on the uninitialized "list" pointer. My static checker complains about this. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index ce5a6da..387fdfc 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -556,8 +556,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, /* Get Cache connections info */ cache_len = snd_hda_get_conn_list(codec, nid, &list); - if (cache_len != conn_len - || memcmp(list, conn, conn_len)) { + if (cache_len < 0 || cache_len != conn_len || + memcmp(list, conn, conn_len) != 0) { snd_iprintf(buffer, " In-driver Connection: %d\n", cache_len); if (cache_len > 0) { snd_iprintf(buffer, " ");

2 4

[alsa-devel] [PATCH -next] ASoC: Intel: sst_hsw: remove kfree for memory allocated with devm_kzalloc
by weiyj_lk＠163.com 17 Apr '15

17 Apr '15

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> It's not necessary to free memory allocated with devm_kzalloc and using kfree leads to a double free. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9..324eceb 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init);

4 3

[alsa-devel] [PATCH -next] ASoC: cs35l32: Remove unused including <linux/version.h>
by weiyj_lk＠163.com 17 Apr '15

17 Apr '15

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Remove including <linux/version.h> that don't need it. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/codecs/cs35l32.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index 60598b2..8f40025 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -13,7 +13,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h>

3 2

[alsa-devel] [PATCH] ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()
by weiyj_lk＠163.com 17 Apr '15

17 Apr '15

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/samsung/s3c24xx-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 326d3c3..5bf7236 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -461,8 +461,8 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return -ENOENT; } s3c24xx_i2s.regs = devm_ioremap_resource(&pdev->dev, res); - if (s3c24xx_i2s.regs == NULL) - return -ENXIO; + if (IS_ERR(s3c24xx_i2s.regs)) + return PTR_ERR(s3c24xx_i2s.regs); s3c24xx_i2s_pcm_stereo_out.dma_addr = res->start + S3C2410_IISFIFO; s3c24xx_i2s_pcm_stereo_in.dma_addr = res->start + S3C2410_IISFIFO;

3 2

[alsa-devel] [PATCH] ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe()
by weiyj_lk＠163.com 17 Apr '15

17 Apr '15

From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> In case of error, the function devm_kzalloc() returns NULL not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> --- sound/soc/codecs/tfa9879.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tfa9879.c b/sound/soc/codecs/tfa9879.c index 16f1b71..aab0af6 100644 --- a/sound/soc/codecs/tfa9879.c +++ b/sound/soc/codecs/tfa9879.c @@ -280,8 +280,8 @@ static int tfa9879_i2c_probe(struct i2c_client *i2c, int i; tfa9879 = devm_kzalloc(&i2c->dev, sizeof(*tfa9879), GFP_KERNEL); - if (IS_ERR(tfa9879)) - return PTR_ERR(tfa9879); + if (!tfa9879) + return -ENOMEM; i2c_set_clientdata(i2c, tfa9879);

3 2

[alsa-devel] [PATCH] ASoC: fsl_ssi: Fix platform_get_irq() error handling
by Fabio Estevam 17 Apr '15

17 Apr '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> We should check whether platform_get_irq() returns a negative number and propagate the error in this case. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/fsl_ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index e8bb8ee..0d48804 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1357,7 +1357,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) } ssi_private->irq = platform_get_irq(pdev, 0); - if (!ssi_private->irq) { + if (ssi_private->irq < 0) { dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); return ssi_private->irq; } -- 1.9.1

2 1

[alsa-devel] [PATCH v3 0/2] ALSA: HDA: add stream params to hda core
by Vinod Koul 17 Apr '15

17 Apr '15

This two patches are splut form the series v2 as they are specfic to HDAC. First adds ASoC device type later to be used by ASOC driver and second for the stream params. Jeeja KP (1): ALSA: hda - add generic functions to set hdac stream params Ramesh Babu (1): ALSA: hda - add ASoC device type for hda core include/sound/hdaudio.h | 3 +++ sound/hda/hdac_stream.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) -- 1.7.9.5

2 3

Re: [alsa-devel] [PATCH] ASoC: max98090: add shutdown callback for max98090
by Caesar Wang 17 Apr '15

17 Apr '15

在 2015年04月17日 15:14, Anish Kumar 写道: > 在 2015年04月16日 10:41, Anish Kumar 写道: >> 在 2015年04月16日 05:14, Anish Kumar 写道: >>> 在 04/10/2015 03:38 AM, Anish Kumar 写道: >>>>> To fix pop noise when shutdown,the pop noise during shutdown >>>>> is the pmic cutoff power of codec without any notice. >>>> Is the power turned off without any intimation to the codec driver? >>>> Or is it physically removed? Can you describe the probelm >>>> better? >>>> When device is shutdown with playing music, the origin driver does nothing for shutdown operation, >>>> as a result, pmic will cut off the power of codec IC, thus cause a pop noise from speaker and headphone. >>>> So the patch added a shutdown callback for driver, enable volume smoothing and disable zero cross, >>>> this is referenced from mic_input which does the samething before mic switch. >>>> I'm very happy if some suggestion from maximintegrate . :-) >>> Please let me know if the patch worked for you. >>> Yes, the patch can work for me. >> I hope this patch is what you tested. >> >> +static void max98090_i2c_shutdown(struct i2c_client *i2c) >> +{ >> + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); >> + >> + dev_info(&i2c->dev, "shut down device\n"); >> + >> + /* enable zero crossing */ >> + regmap_write(max98090->regmap, >> + M98090_REG_LEVEL_CONTROL, M98090_ZDENN_MASK-1); >> + >> + /* turn down volume levels for all the outputs */ >> + regmap_write(max98090->regmap, >> + M98090_REG_RCV_LOUTL_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_LOUTR_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_LEFT_SPK_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_RIGHT_SPK_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_LEFT_HP_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_RIGHT_HP_VOLUME, 0x00); >> + regmap_write(max98090->regmap, >> + M98090_REG_DEVICE_SHUTDOWN, 0x00); >> + msleep(40); >> +} >> + >> Please go ahead and submit to Mark. > With the about is also useful to solve it. > > @zengxing, could you also help verify it? > Verified ? zengxing, who told me is useful to solve it. >>> We had tested on chromiumos. >>>> +static void max98090_i2c_shutdown(struct i2c_client *i2c) >>>> +{ >>>> + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); >>>> + >>>> + dev_info(&i2c->dev, "shut down device\n"); >>>> + >>>> + /* Enable volume smoothing, disable zero cross. This will cause >>>> + * a quick 40ms ramp to mute on shutdown. >>>> + */ >>>> + regmap_write(max98090->regmap, >>>> + M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK); >>>> + regmap_write(max98090->regmap, >>>> + M98090_REG_DEVICE_SHUTDOWN, 0x00); >>>> + msleep(40); >>>> +} >>>> + >>>> >>>> >>> >>> >> -- >> ************************************************************************************** >> 王晓腾 Caesar Wang >> Product R&D Dept.III >> Fuzhou Rockchip Electronics Co.Ltd >> Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) >> 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) >> Tel：+86-591-83991906/07 - 8221 >> Mobile:+86 15059456742 >> E-mail : wxt(a)rock-chips.com >> *************************************************************************************** >> *************************************************************************************** >> IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may >> contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. >> If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the >> information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material >> in its entirety in any format. Thank you. >> *************************************************************************************** >> > -- > ************************************************************************************** > 王晓腾 Caesar Wang > Product R&D Dept.III > Fuzhou Rockchip Electronics Co.Ltd > Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) > 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) > Tel：+86-591-83991906/07 - 8221 > Mobile:+86 15059456742 > E-mail : wxt(a)rock-chips.com > *************************************************************************************** > *************************************************************************************** > IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may > contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. > If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the > information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material > in its entirety in any format. Thank you. > *************************************************************************************** > > -- ************************************************************************************** 王晓腾 Caesar Wang Product R&D Dept.III Fuzhou Rockchip Electronics Co.Ltd Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) Tel：+86-591-83991906/07 - 8221 Mobile:+86 15059456742 E-mail : wxt(a)rock-chips.com *************************************************************************************** *************************************************************************************** IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. ***************************************************************************************

1 0

[alsa-devel] [RFC 3/4] ASoC: topology: Add topology support to ASoC core and DAPM.
by Liam Girdwood 16 Apr '15

16 Apr '15

Add dynamic object support to ASoC kcontrols, widgets, components and cards. Remove all dynamic objects on sound card removal and DAPM free. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-dapm.h | 2 ++ include/sound/soc.h | 11 +++++++++++ sound/soc/soc-core.c | 4 ++++ sound/soc/soc-dapm.c | 4 ++++ 4 files changed, 21 insertions(+) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 3263e36..8d28b36 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -15,6 +15,7 @@ #include <linux/types.h> #include <sound/control.h> +#include <sound/soc-topology.h> #include <sound/asoc.h> struct device; @@ -533,6 +534,7 @@ struct snd_soc_dapm_widget { int num_kcontrols; const struct snd_kcontrol_new *kcontrol_news; struct snd_kcontrol **kcontrols; + struct snd_soc_dobj dobj; /* widget input and outputs */ struct list_head sources; diff --git a/include/sound/soc.h b/include/sound/soc.h index 0d1ade1..e7bc994 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -27,6 +27,7 @@ #include <sound/compress_driver.h> #include <sound/control.h> #include <sound/ac97_codec.h> +#include <sound/soc-topology.h> /* * Convenience kcontrol builders @@ -753,6 +754,9 @@ struct snd_soc_component { struct mutex io_mutex; + /* attached dynamic objects */ + struct list_head dobj_list; + #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_root; #endif @@ -1088,6 +1092,9 @@ struct snd_soc_card { struct list_head dapm_list; struct list_head dapm_dirty; + /* attached dynamic objects */ + struct list_head dobj_list; + /* Generic DAPM context for the card */ struct snd_soc_dapm_context dapm; struct snd_soc_dapm_stats dapm_stats; @@ -1147,6 +1154,7 @@ struct soc_mixer_control { unsigned int sign_bit; unsigned int invert:1; unsigned int autodisable:1; + struct snd_soc_dobj dobj; }; struct soc_bytes { @@ -1157,6 +1165,8 @@ struct soc_bytes { struct soc_bytes_ext { int max; + struct snd_soc_dobj dobj; + /* used for TLV byte control */ int (*get)(unsigned int __user *bytes, unsigned int size); int (*put)(const unsigned int __user *bytes, unsigned int size); @@ -1177,6 +1187,7 @@ struct soc_enum { unsigned int mask; const char * const *texts; const unsigned int *values; + struct snd_soc_dobj dobj; }; /** diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9dfa2e2..3a6ae19 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -40,6 +40,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/soc-dpcm.h> +#include <sound/soc-topology.h> #include <sound/initval.h> #define CREATE_TRACE_POINTS @@ -2434,6 +2435,7 @@ int snd_soc_register_card(struct snd_soc_card *card) card->rtd_aux[i].card = card; INIT_LIST_HEAD(&card->dapm_dirty); + INIT_LIST_HEAD(&card->dobj_list); card->instantiated = 0; mutex_init(&card->mutex); mutex_init(&card->dapm_mutex); @@ -2748,6 +2750,7 @@ static void snd_soc_component_add_unlocked(struct snd_soc_component *component) } list_add(&component->list, &component_list); + INIT_LIST_HEAD(&component->dobj_list); } static void snd_soc_component_add(struct snd_soc_component *component) @@ -2824,6 +2827,7 @@ void snd_soc_unregister_component(struct device *dev) return; found: + snd_soc_tplg_component_remove(cmpnt, SND_SOC_TPLG_ID_ALL); snd_soc_component_del_unlocked(cmpnt); mutex_unlock(&client_mutex); snd_soc_component_cleanup(cmpnt); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 86d350a..c768e02 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -41,6 +41,7 @@ #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> +#include <sound/soc-topology.h> #include <sound/initval.h> #include <trace/events/asoc.h> @@ -2165,6 +2166,9 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) list_for_each_entry_safe(p, next_p, &w->sinks, list_source) dapm_free_path(p); + /* check and free and dynamic widget kcontrols */ + snd_soc_tplg_widget_remove(w); + kfree(w->kcontrols); kfree(w->name); kfree(w); -- 2.1.0

1 0

[alsa-devel] [RFC 2/4] ASoC: topology: Add topology core
by Liam Girdwood 16 Apr '15

16 Apr '15

The topology core parses the FW topology file for known block types and instanciates any common ALSA/ASoC objects that it discovers. The core also passes any block that is does not understand to client component drivers for enumeration. The core exports some APIs to client drivers in order to load and unload firmware topology data as use case require. Currently the core deals with the following object types :- o kcontrols. This includes TLV, enumerated and bytes controls. o DAPM widgets. All types with any associated kcontrol. o DAPM graph. o FE PCM. FE PCM capabilities and configuration can be defined. o BE DAI Link. BE DAI link capabilities and configuration can be defined. o Codec <-> codec style links capabilities and configuration. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-topology.h | 167 ++++ sound/soc/soc-topology.c | 1788 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1955 insertions(+) create mode 100644 include/sound/soc-topology.h create mode 100644 sound/soc/soc-topology.c diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h new file mode 100644 index 0000000..a235004 --- /dev/null +++ b/include/sound/soc-topology.h @@ -0,0 +1,167 @@ +/* + * linux/sound/soc-topology.h -- ALSA SoC Firmware Controls and DAPM + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * 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. + * + * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, + * algorithms, equalisers, DAIs, widgets, FE caps, BE caps, codec link caps etc. + */ + +#ifndef __LINUX_SND_SOC_TPLG_H +#define __LINUX_SND_SOC_TPLG_H + +#include <sound/asoc.h> +#include <linux/list.h> + +struct firmware; +struct snd_kcontrol; +struct snd_soc_tplg_pcm_be; +struct snd_ctl_elem_value; +struct snd_ctl_elem_info; +struct snd_soc_dapm_widget; +struct snd_soc_component; +struct snd_soc_tplg_pcm_fe; +struct snd_soc_dapm_context; +struct snd_soc_card; + +/* object scan be loaded and unloaded in groups with identfying indexes */ +#define SND_SOC_TPLG_ID_ALL 0 /* ID that matches all FW objects */ + +/* dynamic object type */ +enum snd_soc_dobj_type { + SND_SOC_DOBJ_NONE = 0, /* object is not dynamic */ + SND_SOC_DOBJ_MIXER, + SND_SOC_DOBJ_ENUM, + SND_SOC_DOBJ_BYTES, + SND_SOC_DOBJ_PCM, + SND_SOC_DOBJ_DAI_LINK, + SND_SOC_DOBJ_CODEC_LINK, + SND_SOC_DOBJ_WIDGET, +}; + +/* dynamic control object */ +struct snd_soc_dobj_control { + struct snd_kcontrol *kcontrol; + char **dtexts; + unsigned long *dvalues; +}; + +/* dynamic widget object */ +struct snd_soc_dobj_widget { + unsigned int kcontrol_enum:1; /* this widget is an enum kcontrol */ +}; + +/* dynamic PCM DAI object */ +struct snd_soc_dobj_pcm_dai { + struct snd_soc_tplg_pcm_dai *pd; + unsigned int count; +}; + +/* generic dynamic object - all dynamic objects belong to this struct */ +struct snd_soc_dobj { + enum snd_soc_dobj_type type; + unsigned int id; /* objects can belong in different groups */ + struct list_head list; + struct snd_soc_tplg_ops *ops; + union { + struct snd_soc_dobj_control control; + struct snd_soc_dobj_widget widget; + struct snd_soc_dobj_pcm_dai pcm_dai; + }; + void *private; /* core does not touch this */ +}; + +/* + * Kcontrol operations - used to map handlers onto firmware based controls. + */ +struct snd_soc_tplg_kcontrol_ops { + u32 id; + int (*get)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + int (*put)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + int (*info)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo); +}; + +/* + * DAPM widget event handlers - used to map handlers onto widgets. + */ +struct snd_soc_tplg_widget_events { + u16 type; + int (*event_handler)(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event); +}; + +/* + * Public API - Used by component drivers to load and unload dynamic objects + * and their resources. + */ +struct snd_soc_tplg_ops { + + /* external kcontrol init - used to set ext funcs + private data */ + int (*control_load) (struct snd_soc_component *, + struct snd_kcontrol_new *, struct snd_soc_tplg_control_hdr *); + int (*control_unload) (struct snd_soc_component *, + struct snd_soc_dobj *); + + /* external widget init - used to set ext funcs + private data */ + int (*widget_load) (struct snd_soc_component *, + struct snd_soc_dapm_widget *, + struct snd_soc_tplg_dapm_widget *); + int (*widget_unload) (struct snd_soc_component *, + struct snd_soc_dobj *); + + /* FE - used to set ext funcs + private data */ + int (*pcm_dai_load) (struct snd_soc_component *, + struct snd_soc_tplg_pcm_dai *pcm_dai, int num_fe); + int (*pcm_dai_unload) (struct snd_soc_component *, + struct snd_soc_dobj *); + + /* callback to handle vendor bespoke data */ + int (*vendor_load) (struct snd_soc_component *, + struct snd_soc_tplg_hdr *); + int (*vendor_unload) (struct snd_soc_component *, + struct snd_soc_tplg_hdr *); + + /* completion - called at completion of firmware loading */ + void (*complete) (struct snd_soc_component *); + + /* manifest - optional to inform component of manifest */ + int (*manifest) (struct snd_soc_component *, + struct snd_soc_tplg_manifest *); + + /* bespoke kcontrol handlers available for binding */ + const struct snd_soc_tplg_kcontrol_ops *io_ops; + int io_ops_count; +}; + +/* gets a pointer to data from the firmware block header */ +static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr) +{ + const void *ptr = hdr; + return ptr + sizeof(*hdr); +} + +/* Dynamic Object loading and removal for component drivers */ +int snd_soc_tplg_component_load(struct snd_soc_component *comp, + struct snd_soc_tplg_ops *ops, const struct firmware *fw, + u32 index); +int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index); + +/* Widget removal - widgets also removed wth component API */ +void snd_soc_tplg_widget_remove(struct snd_soc_dapm_widget *w); +void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm, + u32 index); + +/* Binds event handlers to dynamic widgets */ +int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, + const struct snd_soc_tplg_widget_events *events, int num_events, + u16 event_type); + +#endif diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c new file mode 100644 index 0000000..620490c --- /dev/null +++ b/sound/soc/soc-topology.c @@ -0,0 +1,1788 @@ +/* + * soc-topology.c -- ALSA SoC Topology + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * Authors: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * K, Mythri P <mythri.p.k(a)intel.com> + * Prusty, Subhransu S <subhransu.s.prusty(a)intel.com> + * B, Jayachandran <jayachandran.b(a)intel.com> + * Abdullah, Omair M <omair.m.abdullah(a)intel.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. + * + * Add support to read audio firmware topology alongside firmware text. The + * topology data can contain kcontrols, DAPM graphs, widgets, DAIs, DAI links, + * equalizers, firmware, coefficients etc. + * + * This file only manages the core ALSA and ASoC components, all other bespoke + * firmware topology data is passed to component drivers for bespoke handling. + */ + +#include <linux/kernel.h> +#include <linux/export.h> +#include <linux/list.h> +#include <linux/firmware.h> +#include <linux/slab.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/soc-topology.h> + +/* + * We make several passes over the data (since it wont necessarily be ordered) + * and process objects in the following order. This guarantees the component + * drivers will be ready with any vendor data before the mixers and DAPM objects + * are loaded (that may make use of the vendor data). + */ +#define SOC_TPLG_PASS_MANIFEST 0 +#define SOC_TPLG_PASS_VENDOR 1 +#define SOC_TPLG_PASS_MIXER 2 +#define SOC_TPLG_PASS_WIDGET 3 +#define SOC_TPLG_PASS_GRAPH 4 +#define SOC_TPLG_PASS_PINS 5 +#define SOC_TPLG_PASS_PCM_DAI 6 + +#define SOC_TPLG_PASS_START SOC_TPLG_PASS_MANIFEST +#define SOC_TPLG_PASS_END SOC_TPLG_PASS_PCM_DAI + +struct soc_tplg { + const char *file; + const struct firmware *fw; + + /* runtime FW parsing */ + const u8 *pos; /* read postion */ + const u8 *hdr_pos; /* header position */ + unsigned int pass; /* pass number */ + + /* component caller */ + struct device *dev; + struct snd_soc_component *comp; + u32 id; /* current block ID */ + u32 req_id; /* required ID, only loaded/free matching blocks */ + + /* kcontrol operations */ + const struct snd_soc_tplg_kcontrol_ops *io_ops; + int io_ops_count; + + /* optional fw loading callbacks to component drivers */ + struct snd_soc_tplg_ops *ops; +}; + +static int soc_tplg_process_headers(struct soc_tplg *tplg); +static void soc_tplg_complete(struct soc_tplg *tplg); + +/* mapping of Kcontrol types and associated operations. */ +static const struct snd_soc_tplg_kcontrol_ops io_ops[] = { + {SOC_CONTROL_IO_VOLSW, snd_soc_get_volsw, + snd_soc_put_volsw, snd_soc_info_volsw}, + {SOC_CONTROL_IO_VOLSW_SX, snd_soc_get_volsw_sx, + snd_soc_put_volsw_sx, NULL}, + {SOC_CONTROL_IO_ENUM, snd_soc_get_enum_double, + snd_soc_put_enum_double, snd_soc_info_enum_double}, + {SOC_CONTROL_IO_ENUM_EXT, NULL, + NULL, snd_soc_info_enum_double}, + {SOC_CONTROL_IO_BYTES, snd_soc_bytes_get, + snd_soc_bytes_put, snd_soc_bytes_info}, + {SOC_CONTROL_IO_BOOL_EXT, NULL, + NULL, snd_ctl_boolean_mono_info}, + {SOC_CONTROL_IO_BYTES_EXT, NULL, + NULL, snd_soc_bytes_info_ext}, + {SOC_CONTROL_IO_ENUM_VALUE, snd_soc_get_enum_double, + snd_soc_put_enum_double, NULL}, + {SOC_CONTROL_IO_RANGE, snd_soc_get_volsw_range, + snd_soc_put_volsw_range, snd_soc_info_volsw_range}, + {SOC_CONTROL_IO_VOLSW_XR_SX, snd_soc_get_xr_sx, + snd_soc_put_xr_sx, snd_soc_info_xr_sx}, + {SOC_CONTROL_IO_STROBE, snd_soc_get_strobe, + snd_soc_put_strobe, NULL}, + + {SOC_CONTROL_IO_VOLSW_EXT, NULL, + NULL, snd_soc_info_volsw}, + {SOC_DAPM_IO_VOLSW, snd_soc_dapm_get_volsw, + snd_soc_dapm_put_volsw, NULL}, + {SOC_DAPM_IO_ENUM_DOUBLE, snd_soc_dapm_get_enum_double, + snd_soc_dapm_put_enum_double, snd_soc_info_enum_double}, + {SOC_DAPM_IO_ENUM_VIRT, snd_soc_dapm_get_enum_double, + snd_soc_dapm_put_enum_double, NULL}, + {SOC_DAPM_IO_ENUM_VALUE, snd_soc_dapm_get_enum_double, + snd_soc_dapm_put_enum_double, NULL}, + {SOC_DAPM_IO_PIN, snd_soc_dapm_get_pin_switch, + snd_soc_dapm_put_pin_switch, snd_soc_dapm_info_pin_switch}, +}; + +/* check we dont overflow the data for this control chunk */ +static int soc_tplg_check_elem_count(struct soc_tplg *tplg, size_t elem_size, + unsigned int count, size_t bytes, const char *elem_type) +{ + const u8 *end = tplg->pos + elem_size * count; + + if (end > tplg->fw->data + tplg->fw->size) { + dev_err(tplg->dev, "ASoC: %s overflow end of data\n", + elem_type); + return -EINVAL; + } + + /* check there is enough room in chunk for control. + extra bytes at the end of control are for vendor data here */ + if (elem_size * count > bytes) { + dev_err(tplg->dev, + "ASoC: %s count %d of size %zu is bigger than chunk %zu\n", + elem_type, count, elem_size, bytes); + return -EINVAL; + } + + return 0; +} + +static inline int soc_tplg_is_eof(struct soc_tplg *tplg) +{ + const u8 *end = tplg->hdr_pos; + + if (end >= tplg->fw->data + tplg->fw->size) + return 1; + return 0; +} + +static inline unsigned long soc_tplg_get_hdr_offset(struct soc_tplg *tplg) +{ + return (unsigned long)(tplg->hdr_pos - tplg->fw->data); +} + +static inline unsigned long soc_tplg_get_offset(struct soc_tplg *tplg) +{ + return (unsigned long)(tplg->pos - tplg->fw->data); +} + +static enum snd_soc_dobj_type get_dobj_mixer_type( + struct snd_soc_tplg_control_hdr *control_hdr) +{ + if (control_hdr == NULL) + return SND_SOC_DOBJ_NONE; + + switch (SOC_CONTROL_GET_ID_INFO(control_hdr->index)) { + case SOC_CONTROL_TYPE_VOLSW: + case SOC_CONTROL_TYPE_VOLSW_EXT: + case SOC_CONTROL_TYPE_STROBE: + case SOC_CONTROL_TYPE_VOLSW_SX: + case SOC_CONTROL_TYPE_VOLSW_S8: + case SOC_CONTROL_TYPE_VOLSW_XR_SX: + case SOC_CONTROL_TYPE_BYTES: + case SOC_CONTROL_TYPE_BOOL_EXT: + case SOC_CONTROL_TYPE_RANGE: + case SOC_DAPM_TYPE_VOLSW: + case SOC_DAPM_TYPE_PIN: + return SND_SOC_DOBJ_MIXER; + case SOC_CONTROL_TYPE_ENUM: + case SOC_CONTROL_TYPE_ENUM_EXT: + case SOC_CONTROL_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_DOUBLE: + case SOC_DAPM_TYPE_ENUM_VIRT: + case SOC_DAPM_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_EXT: + return SND_SOC_DOBJ_ENUM; + case SOC_CONTROL_TYPE_BYTES_EXT: + return SND_SOC_DOBJ_BYTES; + default: + return SND_SOC_DOBJ_NONE; + } +} + +static enum snd_soc_dobj_type get_dobj_type(struct snd_soc_tplg_hdr *hdr, + struct snd_soc_tplg_control_hdr *control_hdr) +{ + switch (hdr->type) { + case SND_SOC_TPLG_MIXER: + return get_dobj_mixer_type(control_hdr); + case SND_SOC_TPLG_DAPM_GRAPH: + case SND_SOC_TPLG_MANIFEST: + return SND_SOC_DOBJ_NONE; + case SND_SOC_TPLG_DAPM_WIDGET: + return SND_SOC_DOBJ_WIDGET; + case SND_SOC_TPLG_DAI_LINK: + return SND_SOC_DOBJ_DAI_LINK; + case SND_SOC_TPLG_PCM: + return SND_SOC_DOBJ_PCM; + case SND_SOC_TPLG_CODEC_LINK: + return SND_SOC_DOBJ_CODEC_LINK; + default: + return SND_SOC_DOBJ_NONE; + } +} + +static inline void soc_bind_err(struct soc_tplg *tplg, int idx, int count) +{ + dev_err(tplg->dev, + "ASoC: invalid control type %d:%d:%d count %d\n", + SOC_CONTROL_GET_ID_GET(idx), SOC_CONTROL_GET_ID_PUT(idx), + SOC_CONTROL_GET_ID_INFO(idx), count); +} + +static inline void soc_control_err(struct soc_tplg *tplg, const char *name, + int idx) +{ + dev_err(tplg->dev, + "ASoC: no complete mixer IO handler for %s type (g,p,i) %d:%d:%d\n", + name, SOC_CONTROL_GET_ID_GET(idx), + SOC_CONTROL_GET_ID_PUT(idx), SOC_CONTROL_GET_ID_INFO(idx)); +} + +/* pass vendor data to component driver for processing */ +static int soc_tplg_vendor_load_(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + int ret = 0; + + if (tplg->comp && tplg->ops && tplg->ops->vendor_load) + ret = tplg->ops->vendor_load(tplg->comp, hdr); + + if (ret < 0) + dev_err(tplg->dev, + "ASoC: vendor load failed at hdr offset %ld/0x%lx for type %d:%d\n", + soc_tplg_get_hdr_offset(tplg), + soc_tplg_get_hdr_offset(tplg), + hdr->type, hdr->vendor_type); + return ret; +} + +/* pass vendor data to component driver for processing */ +static int soc_tplg_vendor_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + if (tplg->pass != SOC_TPLG_PASS_VENDOR) + return 0; + + return soc_tplg_vendor_load_(tplg, hdr); +} + +/* optionally pass new dynamic widget to component driver. This is mainly for + * external widgets where we can assign private data/ops */ +static int soc_tplg_widget_load(struct soc_tplg *tplg, + struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) +{ + if (tplg->comp && tplg->ops && tplg->ops->widget_load) + return tplg->ops->widget_load(tplg->comp, w, tplg_w); + + dev_dbg(tplg->dev, "ASoC: no handler specified for ext widget %s\n", + w->name); + return 0; +} + +/* pass dynamic FEs configurations to component driver */ +static int soc_tplg_pcm_dai_load(struct soc_tplg *tplg, + struct snd_soc_tplg_pcm_dai *pcm_dai, int num_pcm_dai) +{ + if (tplg->comp && tplg->ops && tplg->ops->pcm_dai_load) + return tplg->ops->pcm_dai_load(tplg->comp, pcm_dai, num_pcm_dai); + + dev_dbg(tplg->dev, "ASoC: no handler specified for FEs\n"); + return 0; +} + +/* tell the component driver that all firmware has been loaded in this request */ +static void soc_tplg_complete(struct soc_tplg *tplg) +{ + if (tplg->comp && tplg->ops && tplg->ops->complete) + tplg->ops->complete(tplg->comp); +} + +/* add a dynamic kcontrol */ +static int soc_tplg_add_dcontrol(struct snd_card *card, struct device *dev, + const struct snd_kcontrol_new *control_new, const char *prefix, + void *data, struct snd_kcontrol **kcontrol) +{ + int err; + + *kcontrol = snd_soc_cnew(control_new, data, control_new->name, prefix); + if (*kcontrol == NULL) { + dev_err(dev, "ASoC: Failed to create new kcontrol %s\n", + control_new->name); + return -ENOMEM; + } + + err = snd_ctl_add(card, *kcontrol); + if (err < 0) { + dev_err(dev, "ASoC: Failed to add %s: %d\n", + control_new->name, err); + return err; + } + + return 0; +} + +/* add a dynamic kcontrol for component driver */ +static int soc_tplg_add_kcontrol(struct soc_tplg *tplg, + struct snd_kcontrol_new *k, struct snd_kcontrol **kcontrol) +{ + struct snd_soc_component *comp = tplg->comp; + + return soc_tplg_add_dcontrol(comp->card->snd_card, + comp->dev, k, NULL, comp, kcontrol); +} + +/* remove a mixer kcontrol */ +static void remove_mixer(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + struct snd_card *card = comp->card->snd_card; + struct soc_mixer_control *sm = + container_of(dobj, struct soc_mixer_control, dobj); + const unsigned int *p = NULL; + + if (pass != SOC_TPLG_PASS_MIXER) + return; + + if (dobj->ops && dobj->ops->control_unload) + dobj->ops->control_unload(comp, dobj); + + if (sm->dobj.control.kcontrol->tlv.p) + p = sm->dobj.control.kcontrol->tlv.p; + snd_ctl_remove(card, sm->dobj.control.kcontrol); + list_del(&sm->dobj.list); + kfree(sm); + kfree(p); +} + +/* remove an enum kcontrol */ +static void remove_enum(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + struct snd_card *card = comp->card->snd_card; + struct soc_enum *se = container_of(dobj, struct soc_enum, dobj); + int i; + + if (pass != SOC_TPLG_PASS_MIXER) + return; + + if (dobj->ops && dobj->ops->control_unload) + dobj->ops->control_unload(comp, dobj); + + snd_ctl_remove(card, se->dobj.control.kcontrol); + list_del(&se->dobj.list); + + kfree(se->dobj.control.dvalues); + for (i = 0; i < se->items; i++) + kfree(se->dobj.control.dtexts[i]); + kfree(se); +} + +/* remove a byte kcontrol */ +static void remove_bytes(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + struct snd_card *card = comp->card->snd_card; + struct soc_bytes_ext *sb = + container_of(dobj, struct soc_bytes_ext, dobj); + + if (pass != SOC_TPLG_PASS_MIXER) + return; + + if (dobj->ops && dobj->ops->control_unload) + dobj->ops->control_unload(comp, dobj); + + snd_ctl_remove(card, sb->dobj.control.kcontrol); + list_del(&sb->dobj.list); + kfree(sb); +} + +/* remove a widget and it's kcontrols - routes must be removed first */ +static void remove_widget(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + struct snd_card *card = comp->card->snd_card; + struct snd_soc_dapm_widget *w = + container_of(dobj, struct snd_soc_dapm_widget, dobj); + int i; + + if (pass != SOC_TPLG_PASS_WIDGET) + return; + + if (dobj->ops && dobj->ops->widget_unload) + dobj->ops->widget_unload(comp, dobj); + + /* + * Dynamic Widgets either have 1 enum kcontrol or 1..N mixers. + * The enum may either have an array of values or strings. + */ + if (dobj->widget.kcontrol_enum) { + /* enumerated widget mixer */ + struct soc_enum *se = + (struct soc_enum *)w->kcontrols[0]->private_value; + + snd_ctl_remove(card, w->kcontrols[0]); + + kfree(se->dobj.control.dvalues); + for (i = 0; i < se->items; i++) + kfree(se->dobj.control.dtexts[i]); + + kfree(se); + kfree(w->kcontrol_news); + } else { + /* non enumerated widget mixer */ + for (i = 0; i < w->num_kcontrols; i++) { + struct snd_kcontrol *kcontrol = w->kcontrols[i]; + struct soc_mixer_control *sm = + (struct soc_mixer_control *) kcontrol->private_value; + + kfree(w->kcontrols[i]->tlv.p); + + snd_ctl_remove(card, w->kcontrols[i]); + kfree(sm); + } + kfree(w->kcontrol_news); + } + /* widget w is freed by soc-dapm.c */ +} + +/* remove PCM DAI configurations */ +static void remove_pcm_dai(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + if (pass != SOC_TPLG_PASS_PCM_DAI) + return; + + if (dobj->ops && dobj->ops->pcm_dai_unload) + dobj->ops->pcm_dai_unload(comp, dobj); + + list_del(&dobj->list); + kfree(dobj); +} + +/* bind a kcontrol to it's IO handlers */ +static int soc_tplg_kcontrol_bind_io(u32 io_type, struct snd_kcontrol_new *k, + const struct snd_soc_tplg_kcontrol_ops *ops, int num_ops, + const struct snd_soc_tplg_kcontrol_ops *bops, int num_bops) +{ + int i; + + /* try and map standard kcontrols handler first */ + for (i = 0; i < num_ops; i++) { + + if (SOC_CONTROL_GET_ID_PUT(ops[i].id) == + SOC_CONTROL_GET_ID_PUT(io_type) && ops[i].put) + k->put = ops[i].put; + if (SOC_CONTROL_GET_ID_GET(ops[i].id) == + SOC_CONTROL_GET_ID_GET(io_type) && ops[i].get) + k->get = ops[i].get; + if (SOC_CONTROL_GET_ID_INFO(ops[i].id) == + SOC_CONTROL_GET_ID_INFO(io_type) && ops[i].info) + k->info = ops[i].info; + } + + /* standard handlers found ? */ + if (k->put && k->get && k->info) + return 0; + + /* none found so try bespoke handlers */ + for (i = 0; i < num_bops; i++) { + + if (SOC_CONTROL_GET_ID_PUT(bops[i].id) == + SOC_CONTROL_GET_ID_PUT(io_type) && bops[i].put) + k->put = bops[i].put; + if (SOC_CONTROL_GET_ID_GET(bops[i].id) == + SOC_CONTROL_GET_ID_GET(io_type) && bops[i].get) + k->get = bops[i].get; + if (SOC_CONTROL_GET_ID_INFO(bops[i].id) == + SOC_CONTROL_GET_ID_INFO(io_type) && bops[i].info) + k->info = bops[i].info; + } + + /* bespoke handlers found ? */ + if (k->put && k->get && k->info) + return 0; + + /* nothing to bind */ + return -EINVAL; +} + +/* bind a widgets to it's evnt handlers */ +int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, + const struct snd_soc_tplg_widget_events *events, + int num_events, u16 event_type) +{ + int i; + + w->event = NULL; + + for (i = 0; i < num_events; i++) { + if (event_type == events[i].type) { + + /* found - so assign event */ + w->event = events[i].event_handler; + return 0; + } + } + + /* not found */ + return -EINVAL; +} +EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_bind_event); + +/* optionally pass new dynamic kcontrol to component driver. */ +static int soc_tplg_init_kcontrol(struct soc_tplg *tplg, + struct snd_kcontrol_new *k, struct snd_soc_tplg_control_hdr *hdr) +{ + if (tplg->comp && tplg->ops && tplg->ops->control_load) + return tplg->ops->control_load(tplg->comp, k, hdr); + + dev_dbg(tplg->dev, "ASoC: no handler specified for kcontrol %s\n", + k->name); + return 0; +} + +static int soc_tplg_create_tlv(struct soc_tplg *tplg, + struct snd_kcontrol_new *kc, u32 tlv_size) +{ + struct snd_soc_tplg_ctl_tlv *tplg_tlv; + struct snd_ctl_tlv *tlv; + + if (tlv_size == 0) + return 0; + + tplg_tlv = (struct snd_soc_tplg_ctl_tlv *) tplg->pos; + tplg->pos += tlv_size; + + tlv = kzalloc(sizeof(*tlv) + tlv_size, GFP_KERNEL); + if (tlv == NULL) + return -ENOMEM; + + dev_dbg(tplg->dev, " created TLV type %d size %d bytes\n", + tplg_tlv->numid, tplg_tlv->length); + tlv->numid = tplg_tlv->numid; + tlv->length = tplg_tlv->length; + memcpy(tlv->tlv, tplg_tlv + 1, tplg_tlv->length); + kc->tlv.p = (void *)tlv; + + return 0; +} + +static inline void soc_tplg_free_tlv(struct soc_tplg *tplg, + struct snd_kcontrol_new *kc) +{ + kfree(kc->tlv.p); +} + +static int soc_tplg_dbytes_create(struct soc_tplg *tplg, unsigned int count, + size_t size) +{ + struct snd_soc_tplg_bytes_ext *be; + struct soc_bytes_ext *sbe; + struct snd_kcontrol_new kc; + int i, err; + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_bytes_ext), count, + size, "mixer bytes")) { + dev_err(tplg->dev, "ASoC: Invalid count %d for byte control\n", + count); + return -EINVAL; + } + + for (i = 0; i < count; i++) { + be = (struct snd_soc_tplg_bytes_ext *)tplg->pos; + + /* validate kcontrol */ + if (strnlen(be->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + + sbe = kzalloc(sizeof(*sbe), GFP_KERNEL); + if (sbe == NULL) + return -ENOMEM; + + tplg->pos += (sizeof(struct snd_soc_tplg_bytes_ext) + + be->priv.length); + + dev_dbg(tplg->dev, + "ASoC: adding bytes kcontrol %s with access 0x%x\n", + be->hdr.name, be->hdr.access); + + memset(&kc, 0, sizeof(kc)); + kc.name = be->hdr.name; + kc.private_value = (long)sbe; + kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc.access = be->hdr.access; + + sbe->max = be->max; + sbe->dobj.type = SND_SOC_DOBJ_BYTES; + sbe->dobj.ops= tplg->ops; + INIT_LIST_HEAD(&sbe->dobj.list); + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(be->hdr.index, &kc, io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, tplg->io_ops_count); + + if (err) { + soc_control_err(tplg, be->hdr.name, + be->hdr.index); + kfree(sbe); + continue; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc, + (struct snd_soc_tplg_control_hdr*)be); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + be->hdr.name); + kfree(sbe); + continue; + } + + /* register control here */ + err = soc_tplg_add_kcontrol(tplg, &kc, + &sbe->dobj.control.kcontrol); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to add %s\n", + be->hdr.name); + kfree(sbe); + continue; + } + + list_add(&sbe->dobj.list, &tplg->comp->dobj_list); + } + return 0; + +} +static int soc_tplg_dmixer_create(struct soc_tplg *tplg, unsigned int count, + size_t size) +{ + struct snd_soc_tplg_mixer_control *mc; + struct soc_mixer_control *sm; + struct snd_kcontrol_new kc; + int i, err; + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_mixer_control), + count, size, "mixers")) { + + dev_err(tplg->dev, "ASoC: invalid count %d for controls\n", + count); + return -EINVAL; + } + + for (i = 0; i < count; i++) { + mc = (struct snd_soc_tplg_mixer_control *)tplg->pos; + + /* validate kcontrol */ + if (strnlen(mc->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + + sm = kzalloc(sizeof(*sm), GFP_KERNEL); + if (sm == NULL) + return -ENOMEM; + tplg->pos += (sizeof(struct snd_soc_tplg_mixer_control) + + mc->priv.length); + + dev_dbg(tplg->dev, + "ASoC: adding mixer kcontrol %s with access 0x%x\n", + mc->hdr.name, mc->hdr.access); + + memset(&kc, 0, sizeof(kc)); + kc.name = mc->hdr.name; + kc.private_value = (long)sm; + kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc.access = mc->hdr.access; + + sm->reg = mc->reg; + sm->rreg = mc->rreg; + sm->shift = mc->shift; + sm->rshift = mc->rshift; + sm->max = mc->max; + sm->min = mc->min; + sm->invert = mc->invert; + sm->platform_max = mc->platform_max; + sm->dobj.id = tplg->id; + sm->dobj.ops= tplg->ops; + sm->dobj.type = SND_SOC_DOBJ_MIXER; + INIT_LIST_HEAD(&sm->dobj.list); + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(mc->hdr.index, &kc, io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, tplg->io_ops_count); + if (err) { + soc_control_err(tplg, mc->hdr.name, + mc->hdr.index); + kfree(sm); + continue; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc, + (struct snd_soc_tplg_control_hdr*) mc); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + mc->hdr.name); + kfree(sm); + continue; + } + + /* create any TLV data */ + soc_tplg_create_tlv(tplg, &kc, mc->hdr.tlv_size); + + /* register control here */ + err = soc_tplg_add_kcontrol(tplg, &kc, + &sm->dobj.control.kcontrol); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to add %s\n", + mc->hdr.name); + soc_tplg_free_tlv(tplg, &kc); + kfree(sm); + continue; + } + + list_add(&sm->dobj.list, &tplg->comp->dobj_list); + } + + return 0; +} + +static int soc_tplg_denum_create_texts(struct soc_enum *se, + struct snd_soc_tplg_enum_control *ec) +{ + int i, ret; + + se->dobj.control.dtexts = + kzalloc(sizeof(char *) * ec->items, GFP_KERNEL); + if (se->dobj.control.dtexts == NULL) + return -ENOMEM; + + for (i = 0; i < ec->items; i++) { + + if (strnlen(ec->texts[i], SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) { + ret = -EINVAL; + goto err; + } + + se->dobj.control.dtexts[i] = kstrdup(ec->texts[i], GFP_KERNEL); + if (!se->dobj.control.dtexts[i]) { + ret = -ENOMEM; + goto err; + } + } + + return 0; + +err: + for (--i; i >= 0; i--) + kfree(se->dobj.control.dtexts[i]); + kfree(se->dobj.control.dtexts); + return ret; +} + +static int soc_tplg_denum_create_values(struct soc_enum *se, + struct snd_soc_tplg_enum_control *ec) +{ + if (ec->items > sizeof(*ec->values)) + return -EINVAL; + + se->dobj.control.dvalues = + kmalloc(ec->items * sizeof(u32), GFP_KERNEL); + if (!se->dobj.control.dvalues) + return -ENOMEM; + + memcpy(se->dobj.control.dvalues, ec->values, ec->items * sizeof(u32)); + return 0; +} + +static int soc_tplg_denum_create(struct soc_tplg *tplg, unsigned int count, + size_t size) +{ + struct snd_soc_tplg_enum_control *ec; + struct soc_enum *se; + struct snd_kcontrol_new kc; + int i, ret, err; + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_enum_control), + count, size, "enums")) { + + dev_err(tplg->dev, "ASoC: invalid count %d for enum controls\n", + count); + return -EINVAL; + } + + for (i = 0; i < count; i++) { + ec = (struct snd_soc_tplg_enum_control *)tplg->pos; + tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) + + ec->priv.length); + + /* validate kcontrol */ + if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + + se = kzalloc((sizeof(*se)), GFP_KERNEL); + if (se == NULL) + return -ENOMEM; + + dev_dbg(tplg->dev, "ASoC: adding enum kcontrol %s size %d\n", + ec->hdr.name, ec->items); + + memset(&kc, 0, sizeof(kc)); + kc.name = ec->hdr.name; + kc.private_value = (long)se; + kc.iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc.access = ec->hdr.access; + + se->reg = ec->reg; + se->shift_l = ec->shift_l; + se->shift_r = ec->shift_r; + se->items = ec->items; + se->mask = ec->mask; + se->dobj.id = tplg->id; + se->dobj.type = SND_SOC_DOBJ_ENUM; + se->dobj.ops= tplg->ops; + INIT_LIST_HEAD(&se->dobj.list); + + switch (SOC_CONTROL_GET_ID_INFO(ec->hdr.index)) { + case SOC_DAPM_TYPE_ENUM_VALUE: + case SOC_CONTROL_TYPE_ENUM_VALUE: + err = soc_tplg_denum_create_values(se, ec); + if (err < 0) { + dev_err(tplg->dev, + "ASoC: could not create values for %s\n", + ec->hdr.name); + kfree(se); + continue; + } + /* fall through and create texts */ + case SOC_CONTROL_TYPE_ENUM: + case SOC_CONTROL_TYPE_ENUM_EXT: + case SOC_DAPM_TYPE_ENUM_EXT: + case SOC_DAPM_TYPE_ENUM_DOUBLE: + case SOC_DAPM_TYPE_ENUM_VIRT: + err = soc_tplg_denum_create_texts(se, ec); + if (err < 0) { + dev_err(tplg->dev, + "ASoC: could not create texts for %s\n", + ec->hdr.name); + kfree(se); + continue; + } + break; + default: + dev_err(tplg->dev, + "ASoC: invalid enum control type %d for %s\n", + ec->hdr.index, ec->hdr.name); + kfree(se); + continue; + } + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(ec->hdr.index, &kc, io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, tplg->io_ops_count); + if (err) { + soc_control_err(tplg, ec->hdr.name, + ec->hdr.index); + kfree(se); + continue; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc, + (struct snd_soc_tplg_control_hdr*) ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + ec->hdr.name); + kfree(se); + continue; + } + + /* register control here */ + ret = soc_tplg_add_kcontrol(tplg, + &kc, &se->dobj.control.kcontrol); + if (ret < 0) { + dev_err(tplg->dev, "ASoC: could not add kcontrol %s\n", + ec->hdr.name); + kfree(se); + continue; + } + + list_add(&se->dobj.list, &tplg->comp->dobj_list); + } + + return 0; +} + +static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + struct snd_soc_tplg_elems *elems = + (struct snd_soc_tplg_elems *)tplg->pos; + struct snd_soc_tplg_control_hdr *control_hdr; + int i; + + if (tplg->pass != SOC_TPLG_PASS_MIXER) { + tplg->pos += sizeof(struct snd_soc_tplg_elems) + hdr->size; + return 0; + } + + tplg->pos += sizeof(struct snd_soc_tplg_elems); + + dev_dbg(tplg->dev, "ASoC: adding %d kcontrols\n", elems->count); + + for (i = 0; i < elems->count; i++) { + + control_hdr = (struct snd_soc_tplg_control_hdr *)tplg->pos; + + switch (SOC_CONTROL_GET_ID_INFO(control_hdr->index)) { + case SOC_CONTROL_TYPE_VOLSW: + case SOC_CONTROL_TYPE_VOLSW_EXT: + case SOC_CONTROL_TYPE_STROBE: + case SOC_CONTROL_TYPE_VOLSW_SX: + case SOC_CONTROL_TYPE_VOLSW_S8: + case SOC_CONTROL_TYPE_VOLSW_XR_SX: + case SOC_CONTROL_TYPE_BYTES: + case SOC_CONTROL_TYPE_BOOL_EXT: + case SOC_CONTROL_TYPE_RANGE: + case SOC_DAPM_TYPE_VOLSW: + case SOC_DAPM_TYPE_PIN: + soc_tplg_dmixer_create(tplg, 1, hdr->size); + break; + case SOC_CONTROL_TYPE_ENUM: + case SOC_CONTROL_TYPE_ENUM_EXT: + case SOC_CONTROL_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_DOUBLE: + case SOC_DAPM_TYPE_ENUM_VIRT: + case SOC_DAPM_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_EXT: + soc_tplg_denum_create(tplg, 1, hdr->size); + break; + case SOC_CONTROL_TYPE_BYTES_EXT: + soc_tplg_dbytes_create(tplg, 1, hdr->size); + break; + default: + soc_bind_err(tplg, control_hdr->index, elems->count); + } + } + + return 0; +} + +static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + struct snd_soc_dapm_context *dapm = &tplg->comp->dapm; + struct snd_soc_dapm_route route; + struct snd_soc_tplg_elems *elems = + (struct snd_soc_tplg_elems *)tplg->pos; + struct snd_soc_tplg_dapm_graph_elem *elem; + int count = elems->count, i; + + if (tplg->pass != SOC_TPLG_PASS_GRAPH) { + tplg->pos += sizeof(struct snd_soc_tplg_elems) + hdr->size; + return 0; + } + + tplg->pos += sizeof(struct snd_soc_tplg_elems); + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_dapm_graph_elem), + count, hdr->size, "graph")) { + + dev_err(tplg->dev, "ASoC: invalid count %d for DAPM routes\n", + count); + return -EINVAL; + } + + dev_dbg(tplg->dev, "ASoC: adding %d DAPM routes\n", count); + + for (i = 0; i < count; i++) { + elem = (struct snd_soc_tplg_dapm_graph_elem *)tplg->pos; + tplg->pos += sizeof(struct snd_soc_tplg_dapm_graph_elem); + + /* validate routes */ + if (strnlen(elem->source, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + if (strnlen(elem->sink, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + + route.source = elem->source; + route.sink = elem->sink; + route.connected = NULL; /* set to NULL atm for tplg users */ + if (strnlen(elem->control, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0) + route.control = NULL; + else + route.control = elem->control; + + /* add route, but keep going if some fail */ + snd_soc_dapm_add_routes(dapm, &route, 1); + } + + return 0; +} + +static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create( + struct soc_tplg *tplg, int num_kcontrols) +{ + struct snd_kcontrol_new *kc; + struct soc_mixer_control *sm; + struct snd_soc_tplg_mixer_control *mc; + int i, err; + + kc = kzalloc(sizeof(*kc) * num_kcontrols, GFP_KERNEL); + if (kc == NULL) + return NULL; + + for (i = 0; i < num_kcontrols; i++) { + mc = (struct snd_soc_tplg_mixer_control *)tplg->pos; + sm = kzalloc(sizeof(*sm), GFP_KERNEL); + if (sm == NULL) + goto err; + + tplg->pos += (sizeof(struct snd_soc_tplg_mixer_control) + + mc->priv.length); + + /* validate kcontrol */ + if (strnlen(mc->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + goto err_str; + + dev_dbg(tplg->dev, " adding DAPM widget mixer control %s at %d\n", + mc->hdr.name, i); + + kc[i].name = mc->hdr.name; + kc[i].private_value = (long)sm; + kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc[i].access = mc->hdr.access; + + sm->reg = mc->reg; + sm->rreg = mc->rreg; + sm->shift = mc->shift; + sm->rshift = mc->rshift; + sm->max = mc->max; + sm->min = mc->min; + sm->invert = mc->invert; + sm->platform_max = mc->platform_max; + sm->dobj.id = tplg->id; + INIT_LIST_HEAD(&sm->dobj.list); + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(mc->hdr.index, &kc[i], io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, tplg->io_ops_count); + if (err) { + soc_control_err(tplg, mc->hdr.name, + mc->hdr.index); + kfree(sm); + continue; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc[i], + (struct snd_soc_tplg_control_hdr*)mc); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + mc->hdr.name); + kfree(sm); + continue; + } + } + return kc; + +err_str: + kfree(sm); +err: + for (--i; i >= 0; i--) + kfree((void *)kc[i].private_value); + kfree(kc); + return NULL; +} + +static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create( + struct soc_tplg *tplg) +{ + struct snd_kcontrol_new *kc; + struct snd_soc_tplg_enum_control *ec; + struct soc_enum *se; + int i, err; + + ec = (struct snd_soc_tplg_enum_control *)tplg->pos; + tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) + + ec->priv.length); + + /* validate kcontrol */ + if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return NULL; + + kc = kzalloc(sizeof(*kc), GFP_KERNEL); + if (kc == NULL) + return NULL; + + se = kzalloc(sizeof(*se), GFP_KERNEL); + if (se == NULL) + goto err; + + dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n", + ec->hdr.name); + + kc->name = ec->hdr.name; + kc->private_value = (long)se; + kc->iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc->access = ec->hdr.access; + + se->reg = ec->reg; + se->shift_l = ec->shift_l; + se->shift_r = ec->shift_r; + se->items = ec->items; + se->mask = ec->mask; + se->dobj.id = tplg->id; + + switch (SOC_CONTROL_GET_ID_INFO(ec->hdr.index)) { + case SOC_CONTROL_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_VALUE: + err = soc_tplg_denum_create_values(se, ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: could not create values for %s\n", + ec->hdr.name); + goto err_se; + } + /* fall through to create texts */ + case SOC_CONTROL_TYPE_ENUM: + case SOC_CONTROL_TYPE_ENUM_EXT: + case SOC_DAPM_TYPE_ENUM_EXT: + case SOC_DAPM_TYPE_ENUM_DOUBLE: + case SOC_DAPM_TYPE_ENUM_VIRT: + err = soc_tplg_denum_create_texts(se, ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: could not create texts for %s\n", + ec->hdr.name); + goto err_se; + } + break; + default: + dev_err(tplg->dev, "ASoC: invalid enum control type %d for %s\n", + ec->hdr.index, ec->hdr.name); + goto err_se; + } + + /* map io handlers */ + err = soc_tplg_kcontrol_bind_io(ec->hdr.index, kc, io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, tplg->io_ops_count); + if (err) { + soc_control_err(tplg, ec->hdr.name, + ec->hdr.index); + goto err_se; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, kc, + (struct snd_soc_tplg_control_hdr*)ec); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + ec->hdr.name); + goto err_se; + } + + return kc; + +err_se: + /* free values and texts */ + kfree(se->dobj.control.dvalues); + for (i = 0; i < ec->items; i++) + kfree(se->dobj.control.dtexts[i]); + + kfree(se); +err: + kfree(kc); + + return NULL; +} + +static struct snd_kcontrol_new *soc_tplg_dapm_widget_dbytes_create( + struct soc_tplg *tplg, int count) +{ + struct snd_soc_tplg_bytes_ext *be; + struct soc_bytes_ext *sbe; + struct snd_kcontrol_new *kc; + int i, err; + + kc = kzalloc(sizeof(*kc) * count, GFP_KERNEL); + if (!kc) + return NULL; + + for (i = 0; i < count; i++) { + be = (struct snd_soc_tplg_bytes_ext *)tplg->pos; + + /* validate kcontrol */ + if (strnlen(be->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + goto err; + + sbe = kzalloc(sizeof(*sbe), GFP_KERNEL); + if (sbe == NULL) + goto err; + + tplg->pos += (sizeof(struct snd_soc_tplg_bytes_ext) + + be->priv.length); + + dev_dbg(tplg->dev, + "ASoC: adding bytes kcontrol %s with access 0x%x\n", + be->hdr.name, be->hdr.access); + + memset(kc, 0, sizeof(*kc)); + kc[i].name = be->hdr.name; + kc[i].private_value = (long)sbe; + kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER; + kc[i].access = be->hdr.access; + + sbe->max = be->max; + INIT_LIST_HEAD(&sbe->dobj.list); + + /* map standard io handlers and check for external handlers */ + err = soc_tplg_kcontrol_bind_io(be->hdr.index, &kc[i], io_ops, + ARRAY_SIZE(io_ops), tplg->io_ops, + tplg->io_ops_count); + if (err) { + soc_control_err(tplg, be->hdr.name, + be->hdr.index); + kfree(sbe); + continue; + } + + /* pass control to driver for optional further init */ + err = soc_tplg_init_kcontrol(tplg, &kc[i], + (struct snd_soc_tplg_control_hdr*)be); + if (err < 0) { + dev_err(tplg->dev, "ASoC: failed to init %s\n", + be->hdr.name); + kfree(sbe); + continue; + } + } + + return kc; + +err: + for (--i; i >= 0; i--) + kfree((void *)kc[i].private_value); + + kfree(kc); + return NULL; +} + +static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, + struct snd_soc_tplg_dapm_widget *w) +{ + struct snd_soc_dapm_context *dapm = &tplg->comp->dapm; + struct snd_soc_dapm_widget template, *widget; + struct snd_soc_tplg_control_hdr *control_hdr; + int ret = 0; + + if (strnlen(w->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + if (strnlen(w->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) + return -EINVAL; + + dev_dbg(tplg->dev, "ASoC: creating DAPM widget %s id %d\n", + w->name, w->id); + + memset(&template, 0, sizeof(template)); + template.id = w->id; + template.name = kstrdup(w->name, GFP_KERNEL); + if (!template.name) + return -ENOMEM; + template.sname = kstrdup(w->sname, GFP_KERNEL); + if (!template.sname) { + ret = -ENOMEM; + goto err; + } + template.reg = w->reg; + template.shift = w->shift; + template.mask = w->mask; + template.on_val = w->invert ? 0 : 1; + template.off_val = w->invert ? 1 : 0; + template.ignore_suspend = w->ignore_suspend; + template.event_flags = w->event_flags; + template.dobj.id = tplg->id; + + tplg->pos += + (sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.length); + if (w->num_kcontrols == 0) { + template.num_kcontrols = 0; + goto widget; + } + + control_hdr = (struct snd_soc_tplg_control_hdr *)tplg->pos; + dev_dbg(tplg->dev, "ASoC: template %s has %d controls of type %x\n", + w->name, w->num_kcontrols, control_hdr->index); + + switch (SOC_CONTROL_GET_ID_INFO(control_hdr->index)) { + case SOC_CONTROL_TYPE_VOLSW: + case SOC_CONTROL_TYPE_STROBE: + case SOC_CONTROL_TYPE_VOLSW_SX: + case SOC_CONTROL_TYPE_VOLSW_S8: + case SOC_CONTROL_TYPE_VOLSW_XR_SX: + case SOC_CONTROL_TYPE_BYTES: + case SOC_CONTROL_TYPE_BOOL_EXT: + case SOC_CONTROL_TYPE_RANGE: + case SOC_DAPM_TYPE_VOLSW: + template.num_kcontrols = w->num_kcontrols; + template.kcontrol_news = soc_tplg_dapm_widget_dmixer_create(tplg, + template.num_kcontrols); + if (!template.kcontrol_news) { + ret = -ENOMEM; + goto hdr_err; + } + break; + case SOC_CONTROL_TYPE_ENUM: + case SOC_CONTROL_TYPE_ENUM_EXT: + case SOC_CONTROL_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_DOUBLE: + case SOC_DAPM_TYPE_ENUM_VIRT: + case SOC_DAPM_TYPE_ENUM_VALUE: + case SOC_DAPM_TYPE_ENUM_EXT: + template.dobj.widget.kcontrol_enum = 1; + template.num_kcontrols = 1; + template.kcontrol_news = soc_tplg_dapm_widget_denum_create(tplg); + if (!template.kcontrol_news) { + ret = -ENOMEM; + goto hdr_err; + } + break; + case SOC_CONTROL_TYPE_BYTES_EXT: + template.num_kcontrols = w->num_kcontrols; + template.kcontrol_news = + soc_tplg_dapm_widget_dbytes_create(tplg, + template.num_kcontrols); + if (!template.kcontrol_news) { + ret = -ENOMEM; + goto hdr_err; + } + break; + default: + dev_err(tplg->dev, "ASoC: invalid widget control type %d:%d:%d\n", + SOC_CONTROL_GET_ID_GET(control_hdr->index), + SOC_CONTROL_GET_ID_PUT(control_hdr->index), + SOC_CONTROL_GET_ID_INFO(control_hdr->index)); + ret = -EINVAL; + goto hdr_err; + } + +widget: + ret = soc_tplg_widget_load(tplg, &template, w); + if (ret < 0) + goto hdr_err; + + widget = snd_soc_dapm_new_control(dapm, &template); + if (widget == NULL) { + dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", + w->name); + goto hdr_err; + } + + widget->dobj.type = SND_SOC_DOBJ_WIDGET; + widget->dobj.ops = tplg->ops; + widget->dobj.id = tplg->id; + list_add(&widget->dobj.list, &tplg->comp->dobj_list); + return 0; + +hdr_err: + kfree(template.sname); +err: + kfree(template.name); + return ret; +} + +static int soc_tplg_dapm_widget_elems_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + struct snd_soc_tplg_elems *elems = + (struct snd_soc_tplg_elems *)tplg->pos; + struct snd_soc_tplg_dapm_widget *widget; + int ret, count = elems->count, i; + + if (tplg->pass != SOC_TPLG_PASS_WIDGET) + return 0; + + tplg->pos += sizeof(struct snd_soc_tplg_elems); + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_dapm_graph_elem), count, + hdr->size, "widget")) { + + dev_err(tplg->dev, "ASoC: invalid count %d for widgets\n", + count); + return -EINVAL; + } + + dev_dbg(tplg->dev, "ASoC: adding %d DAPM widgets\n", count); + + for (i = 0; i < count; i++) { + widget = (struct snd_soc_tplg_dapm_widget *) tplg->pos; + ret = soc_tplg_dapm_widget_create(tplg, widget); + if (ret < 0) + dev_err(tplg->dev, "ASoC: failed to load widget %s\n", + widget->name); + } + + return 0; +} + +static int soc_tplg_dapm_complete(struct soc_tplg *tplg) +{ + struct snd_soc_card *card = tplg->comp->card; + int ret; + + /* Card might not have been registered at this point. + * If so, just return success. + */ + if (!card) { + dev_warn(tplg->dev, "ASoC: Parent card not yet available," + "Do not add new widgets now\n"); + return 0; + } + + ret = snd_soc_dapm_new_widgets(card); + if (ret < 0) + dev_err(tplg->dev, "ASoC: failed to create new widgets %d\n", + ret); + + return ret; +} + +static int soc_tplg_pcm_dai_elems_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + struct snd_soc_tplg_elems *elems = + (struct snd_soc_tplg_elems *)tplg->pos; + struct snd_soc_tplg_pcm_dai *pcm_dai; + struct snd_soc_dobj *dobj; + int count = elems->count; + int ret; + + if (tplg->pass != SOC_TPLG_PASS_PCM_DAI) + return 0; + + tplg->pos += sizeof(struct snd_soc_tplg_elems); + pcm_dai = (struct snd_soc_tplg_pcm_dai *)tplg->pos; + + if (soc_tplg_check_elem_count(tplg, + sizeof(struct snd_soc_tplg_pcm_dai), count, hdr->size, "PCM DAI")) { + dev_err(tplg->dev, "ASoC: invalid count %d for PCM DAI elems\n", + count); + return -EINVAL; + } + + dev_dbg(tplg->dev, "ASoC: adding %d PCM DAIs\n", count); + tplg->pos += sizeof(struct snd_soc_tplg_pcm_dai) + count; + + dobj = kzalloc(sizeof(struct snd_soc_dobj), GFP_KERNEL); + if (dobj == NULL) + return -ENOMEM; + + /* Call the platform driver call back to register the dais */ + ret = soc_tplg_pcm_dai_load(tplg, pcm_dai, count); + if (ret < 0) { + dev_err(tplg->comp->dev, "ASoC: PCM DAI loading failed\n"); + goto err; + } + + dobj->type = get_dobj_type(hdr, NULL); + dobj->pcm_dai.count = count; + dobj->pcm_dai.pd = pcm_dai; + dobj->ops = tplg->ops; + dobj->id = tplg->id; + list_add(&dobj->list, &tplg->comp->dobj_list); + return 0; + +err: + kfree(dobj); + return ret; +} + +static int soc_tplg_manifest_load(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + struct snd_soc_tplg_manifest *manifest; + + if (tplg->pass != SOC_TPLG_PASS_MANIFEST) + return 0; + + manifest = (struct snd_soc_tplg_manifest*)tplg->pos; + tplg->pos += sizeof(struct snd_soc_tplg_manifest); + + if (tplg->comp && tplg->ops && tplg->ops->manifest) + return tplg->ops->manifest(tplg->comp, manifest); + + dev_err(tplg->dev, "ASoC: Firmware manifest not supported\n"); + return 0; +} + +/* validate header magic, size and type */ +static int soc_valid_header(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + if (soc_tplg_get_hdr_offset(tplg) >= tplg->fw->size) + return 0; + + /* big endian firmware objects not supported atm */ + if (hdr->magic == cpu_to_be32(SND_SOC_TPLG_MAGIC)) { + dev_err(tplg->dev, + "ASoC: %s at pass %d big endian not supported header got %x at offset 0x%lx size 0x%zx.\n", + tplg->file, tplg->pass, hdr->magic, + soc_tplg_get_hdr_offset(tplg), tplg->fw->size); + return -EINVAL; + } + + if (hdr->magic != SND_SOC_TPLG_MAGIC) { + dev_err(tplg->dev, + "ASoC: %s at pass %d does not have a valid header got %x at offset 0x%lx size 0x%zx.\n", + tplg->file, tplg->pass, hdr->magic, + soc_tplg_get_hdr_offset(tplg), tplg->fw->size); + return -EINVAL; + } + + if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) { + dev_err(tplg->dev, + "ASoC: %s at pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n", + tplg->file, tplg->pass, hdr->abi, + SND_SOC_TPLG_ABI_VERSION, soc_tplg_get_hdr_offset(tplg), + tplg->fw->size); + return -EINVAL; + } + + if (hdr->size == 0) { + dev_err(tplg->dev, "ASoC: %s header has 0 size at offset 0x%lx.\n", + tplg->file, soc_tplg_get_hdr_offset(tplg)); + return -EINVAL; + } + + if (tplg->pass == hdr->type) + dev_dbg(tplg->dev, + "ASoC: Got 0x%x bytes of type %d version %d vendor %d at pass %d\n", + hdr->size, hdr->type, hdr->version, hdr->vendor_type, + tplg->pass); + + return 1; +} + +/* check header type and call appropriate handler */ +static int soc_tplg_load_header(struct soc_tplg *tplg, + struct snd_soc_tplg_hdr *hdr) +{ + tplg->pos = tplg->hdr_pos + sizeof(struct snd_soc_tplg_hdr); + + /* check for matching ID */ + if (hdr->id != tplg->req_id && hdr->id != SND_SOC_TPLG_ID_ALL) + return 0; + + tplg->id = hdr->id; + + switch (hdr->type) { + case SND_SOC_TPLG_MIXER: + return soc_tplg_kcontrol_elems_load(tplg, hdr); + case SND_SOC_TPLG_DAPM_GRAPH: + return soc_tplg_dapm_graph_elems_load(tplg, hdr); + case SND_SOC_TPLG_DAPM_WIDGET: + return soc_tplg_dapm_widget_elems_load(tplg, hdr); + case SND_SOC_TPLG_PCM: + case SND_SOC_TPLG_DAI_LINK: + case SND_SOC_TPLG_CODEC_LINK: + return soc_tplg_pcm_dai_elems_load(tplg, hdr); + case SND_SOC_TPLG_MANIFEST: + return soc_tplg_manifest_load(tplg, hdr); + default: + /* bespoke vendor data object */ + return soc_tplg_vendor_load(tplg, hdr); + } + + return 0; +} + +/* process the topology file headers */ +static int soc_tplg_process_headers(struct soc_tplg *tplg) +{ + struct snd_soc_tplg_hdr *hdr; + int ret; + + tplg->pass = SOC_TPLG_PASS_START; + + /* process the header types from start to end */ + while (tplg->pass <= SOC_TPLG_PASS_END) { + + tplg->hdr_pos = tplg->fw->data; + hdr = (struct snd_soc_tplg_hdr *)tplg->hdr_pos; + + while (!soc_tplg_is_eof(tplg)) { + + /* make sure header is valid before loading */ + ret = soc_valid_header(tplg, hdr); + if (ret < 0) + return ret; + else if (ret == 0) + break; + + /* load the header object */ + ret = soc_tplg_load_header(tplg, hdr); + if (ret < 0) + return ret; + + /* goto next header */ + tplg->hdr_pos += hdr->size + + sizeof(struct snd_soc_tplg_hdr); + hdr = (struct snd_soc_tplg_hdr *)tplg->hdr_pos; + } + + /* next data type pass */ + tplg->pass++; + } + + /* signal DAPM we are complete */ + ret = soc_tplg_dapm_complete(tplg); + if (ret < 0) + dev_err(tplg->dev, + "ASoC: failed to initialise DAPM from Firmware\n"); + + return ret; +} + +static int soc_tplg_load(struct soc_tplg *tplg) +{ + int ret; + + ret = soc_tplg_process_headers(tplg); + if (ret == 0) + soc_tplg_complete(tplg); + + return ret; +} + +/* load audio component topology from "firmware" file */ +int snd_soc_tplg_component_load(struct snd_soc_component *comp, + struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id) +{ + struct soc_tplg tplg; + + /* setup parsing context */ + memset(&tplg, 0, sizeof(tplg)); + tplg.fw = fw; + tplg.dev = comp->dev; + tplg.comp = comp; + tplg.ops = ops; + tplg.req_id = id; + tplg.io_ops = ops->io_ops; + tplg.io_ops_count = ops->io_ops_count; + + return soc_tplg_load(&tplg); +} +EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load); + +/* remove this dynamic widget */ +void snd_soc_tplg_widget_remove(struct snd_soc_dapm_widget *w) +{ + /* make sure we are a widget */ + if (w->dobj.type != SND_SOC_DOBJ_WIDGET) + return; + + remove_widget(w->dapm->component, &w->dobj, SOC_TPLG_PASS_WIDGET); +} +EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove); + +/* remove all dynamic widgets from this DAPM context */ +void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm, + u32 id) +{ + struct snd_soc_dapm_widget *w, *next_w; + struct snd_soc_dapm_path *p, *next_p; + + list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) { + + /* make sure we are a widget with correct context */ + if (w->dobj.type != SND_SOC_DOBJ_WIDGET || w->dapm != dapm) + continue; + + /* match ID */ + if (w->dobj.id != id && w->dobj.id != SND_SOC_TPLG_ID_ALL) + continue; + + list_del(&w->list); + + /* + * remove source and sink paths associated to this widget. + * While removing the path, remove reference to it from both + * source and sink widgets so that path is removed only once. + */ + list_for_each_entry_safe(p, next_p, &w->sources, list_sink) { + list_del(&p->list_sink); + list_del(&p->list_source); + list_del(&p->list); + kfree(p); + } + list_for_each_entry_safe(p, next_p, &w->sinks, list_source) { + list_del(&p->list_sink); + list_del(&p->list_source); + list_del(&p->list); + kfree(p); + } + /* check and free and dynamic widget kcontrols */ + snd_soc_tplg_widget_remove(w); + kfree(w->kcontrols); + kfree(w->name); + kfree(w); + } +} +EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove_all); + +/* remove dynamic controls from the component driver */ +int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 id) +{ + struct snd_soc_dobj *dobj, *next_dobj; + int pass = SOC_TPLG_PASS_END; + + /* process the header types from end to start */ + while (pass >= SOC_TPLG_PASS_START) { + + /* remove mixer controls */ + list_for_each_entry_safe(dobj, next_dobj, &comp->dobj_list, + list) { + + /* match ID */ + if (dobj->id != id && + dobj->id != SND_SOC_TPLG_ID_ALL) + continue; + + switch (dobj->type) { + case SND_SOC_DOBJ_MIXER: + remove_mixer(comp, dobj, pass); + break; + case SND_SOC_DOBJ_ENUM: + remove_enum(comp, dobj, pass); + break; + case SND_SOC_DOBJ_BYTES: + remove_bytes(comp, dobj, pass); + break; + case SND_SOC_DOBJ_WIDGET: + remove_widget(comp, dobj, pass); + break; + case SND_SOC_DOBJ_PCM: + case SND_SOC_DOBJ_DAI_LINK: + case SND_SOC_DOBJ_CODEC_LINK: + remove_pcm_dai(comp, dobj, pass); + break; + default: + dev_err(comp->dev, "ASoC: invalid component type %d for removal\n", + dobj->type); + break; + } + } + pass--; + } + + /* let caller know if FW can be freed when no objects are left */ + return !list_empty(&comp->dobj_list); +} +EXPORT_SYMBOL_GPL(snd_soc_tplg_component_remove); -- 2.1.0

1 0

[alsa-devel] [PATCH 00/16] HD-audio core controller split
by Takashi Iwai 16 Apr '15

16 Apr '15

Hi, this is a patch series for splitting the existing HD-audio controller code to a core library. The purose of this split is to help writing other HD-audio controller codes more easily. With these library codes, a controller driver can be written up with small skeleton codes. I have done quick tests, and no obvious regression found, so submitted here for reviews. The patches are found in topic/hda branch of sound git tree. Note that this series isn't targeted for 4.1 but for 4.2. Takashi === Jeeja KP (1): ALSA: hda - moved alloc/free stream pages function to controller library Takashi Iwai (15): ALSA: hda - Handle error from get_response bus ops directly ALSA: hda - Add the controller helper codes to hda-core module ALSA: hda - Add DSP loader to core library code ALSA: hda - Merge codec and controller helpers ALSA: hda - Move send_cmd / get_response to hdac_bus_ops ALSA: hda - Pass bus io_ops directly from the top-level driver ALSA: hda - Migrate hdac_stream into legacy driver ALSA: hda - Migrate more hdac_stream codes ALSA: hda - Embed bus into controller object ALSA: hda - Minor refactoring ALSA: hda - Move PCM format and rate handling code to core library ALSA: hda - Add missing inclusion of <linux/clocksource.h> ALSA: hda - Reenable tracepoints for controller ALSA: hda/tegra - Fix build error and warning ALSA: hda - Drop azx_sd_read*/write*() macros include/sound/hda_register.h | 152 +++++ include/sound/hdaudio.h | 282 ++++++++- sound/hda/Kconfig | 3 + sound/hda/Makefile | 2 +- sound/hda/hdac_bus.c | 20 +- sound/hda/hdac_controller.c | 507 +++++++++++++++ sound/hda/hdac_device.c | 300 +++++++++ sound/hda/hdac_stream.c | 648 ++++++++++++++++++++ sound/pci/hda/Kconfig | 3 - sound/pci/hda/Makefile | 3 +- sound/pci/hda/hda_codec.c | 409 +------------ sound/pci/hda/hda_codec.h | 31 +- sound/pci/hda/hda_controller.c | 1295 ++++++++------------------------------- sound/pci/hda/hda_controller.h | 269 +------- sound/pci/hda/hda_intel.c | 234 +++---- sound/pci/hda/hda_intel.h | 1 + sound/pci/hda/hda_intel_trace.h | 4 +- sound/pci/hda/hda_tegra.c | 76 +-- sound/pci/hda/patch_ca0132.c | 7 +- 19 files changed, 2395 insertions(+), 1851 deletions(-) create mode 100644 include/sound/hda_register.h create mode 100644 sound/hda/hdac_controller.c create mode 100644 sound/hda/hdac_stream.c -- 2.3.5

1 16

[alsa-devel] [PATCH 0/2] i2c: rework last users of 2.4 style attach_adapter
by Wolfram Sang 16 Apr '15

16 Apr '15

The attach_adapter mechanism of the I2C framework is deprecated for years. There are two users left; drivers for old Macintosh computers. I got the idea of replacing this mechanism with a custom one with the help of deferred probing. Because I don't have the hardware, I modified the windtunnel driver to be runnable on my Renesas Lager board (ARM). This patch is not in this series but in the branch mentioned below. I first verified that the attach_adapter method was in deed used for bus scanning. When scanning, the driver rightfully failed on detecting the actual i2c clients because there is no such hardware on my board. However, the actual scanning happened. Using my custom mechanism, the same happens: all busses get scanned, then the clients cannot be detected. Since I didn't change the actual detection code, I assume that it should be working on those Macintosh devices as well. The keywest driver is only compile-tested. That being said, I'd be more than happy, if we could find someone willing to test these patches. Top-of-tree kernel would be nice, but these patches can easily be backported to probably the beginning of deferred probing. I will also notify some ppc lists of distributions of this thread for further help. If this works out, we can _finally_ get rid of this stone-age mechanism and clean up the i2c core. Changes since RFC: return -ENODEV instead of 0 when exiting the while loop (= nothing found on all busses) The branch I used for ARM compilation is here: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/attach_adapter_removal_with_arm_compile-experimental Thanks, Wolfram Wolfram Sang (2): macintosh: therm_windtunnel: drop using attach adapter sound: ppc: keywest: drop using attach adapter drivers/macintosh/therm_windtunnel.c | 25 +++++++++++++++++++++++-- sound/ppc/keywest.c | 23 +++++++++++++++++++---- 2 files changed, 42 insertions(+), 6 deletions(-) -- 2.1.4

1 2

Re: [alsa-devel] [PATCH] ALSA: remove deprecated use of pci api
by Takashi Iwai 16 Apr '15

16 Apr '15

At Wed, 15 Apr 2015 16:10:17 +0200, Quentin Lambert wrote: > > Replace occurences of the pci api by appropriate call to the dma api. > > A simplified version of the semantic patch that finds this problem is as > follows: (http://coccinelle.lip6.fr) > > @deprecated@ > idexpression id; > position p; > @@ > > ( > pci_dma_supported@p ( id, ...) > | > pci_alloc_consistent@p ( id, ...) > ) > > @bad1@ > idexpression id; > position deprecated.p; > @@ > ...when != &id->dev > when != pci_get_drvdata ( id ) > when != pci_enable_device ( id ) > ( > pci_dma_supported@p ( id, ...) > | > pci_alloc_consistent@p ( id, ...) > ) > > @depends on !bad1@ > idexpression id; > expression direction; > position deprecated.p; > @@ > > ( > - pci_dma_supported@p ( id, > + dma_supported ( &id->dev, > ... > + , GFP_ATOMIC > ) > | > - pci_alloc_consistent@p ( id, > + dma_alloc_coherent ( &id->dev, > ... > + , GFP_ATOMIC > ) > ) > > Signed-off-by: Quentin Lambert <lambert.quentin(a)gmail.com> Thanks, applied to for-4.2 branch. Takashi

1 0

[alsa-devel] [patch 04/39] sound: Use hrtimer_resolution instead of hrtimer_get_res()
by Thomas Gleixner 16 Apr '15

16 Apr '15

No point in converting a timespec now that the value is directly accessible. Get rid of the null check while at it. Resolution is guaranteed to be > 0. Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org --- sound/core/hrtimer.c | 9 +-------- sound/drivers/pcsp/pcsp.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) Index: tip/sound/core/hrtimer.c =================================================================== --- tip.orig/sound/core/hrtimer.c +++ tip/sound/core/hrtimer.c @@ -121,16 +121,9 @@ static struct snd_timer *mytimer; static int __init snd_hrtimer_init(void) { struct snd_timer *timer; - struct timespec tp; int err; - hrtimer_get_res(CLOCK_MONOTONIC, &tp); - if (tp.tv_sec > 0 || !tp.tv_nsec) { - pr_err("snd-hrtimer: Invalid resolution %u.%09u", - (unsigned)tp.tv_sec, (unsigned)tp.tv_nsec); - return -EINVAL; - } - resolution = tp.tv_nsec; + resolution = hrtimer_resolution; /* Create a new timer and set up the fields */ err = snd_timer_global_new("hrtimer", SNDRV_TIMER_GLOBAL_HRTIMER, Index: tip/sound/drivers/pcsp/pcsp.c =================================================================== --- tip.orig/sound/drivers/pcsp/pcsp.c +++ tip/sound/drivers/pcsp/pcsp.c @@ -42,16 +42,13 @@ struct snd_pcsp pcsp_chip; static int snd_pcsp_create(struct snd_card *card) { static struct snd_device_ops ops = { }; - struct timespec tp; - int err; - int div, min_div, order; - - hrtimer_get_res(CLOCK_MONOTONIC, &tp); + unsigned int resolution = hrtimer_resolution; + int err, div, min_div, order; if (!nopcm) { - if (tp.tv_sec || tp.tv_nsec > PCSP_MAX_PERIOD_NS) { + if (resolution > PCSP_MAX_PERIOD_NS) { printk(KERN_ERR "PCSP: Timer resolution is not sufficient " - "(%linS)\n", tp.tv_nsec); + "(%linS)\n", resolution); printk(KERN_ERR "PCSP: Make sure you have HPET and ACPI " "enabled.\n"); printk(KERN_ERR "PCSP: Turned into nopcm mode.\n"); @@ -59,13 +56,13 @@ static int snd_pcsp_create(struct snd_ca } } - if (loops_per_jiffy >= PCSP_MIN_LPJ && tp.tv_nsec <= PCSP_MIN_PERIOD_NS) + if (loops_per_jiffy >= PCSP_MIN_LPJ && resolution <= PCSP_MIN_PERIOD_NS) min_div = MIN_DIV; else min_div = MAX_DIV; #if PCSP_DEBUG printk(KERN_DEBUG "PCSP: lpj=%li, min_div=%i, res=%li\n", - loops_per_jiffy, min_div, tp.tv_nsec); + loops_per_jiffy, min_div, resolution); #endif div = MAX_DIV / min_div;

2 2

[alsa-devel] Separate input and output jacks for one UCM device?
by Tanu Kaskinen 16 Apr '15

16 Apr '15

Hi Liam and alsa-devel, My understanding is that a UCM device can represent a thing that has both input and output (I don't particularly like that, but it's too late to complain). How likely do you think that there are or there will be some drivers that expose separate input and output jack kcontrols for a headset jack, to differentiate between headphones/headset/microphone? My understanding is that jack kcontrols store only booleans, so there's no way to distinguish between headphones and a headset with just one kcontrol. The current UCM "spec" doesn't support specifying multiple kcontrols, since there's only one "JackControl" value. (Perhaps the "JackDev" value suffers from this problem too, but I don't know if jack input devices already support reporting the state separately for input and output.) -- Tanu

7 27

[alsa-devel] [PATCH] ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
by Scott Wood 16 Apr '15

16 Apr '15

DEVICE_ALI previously would jump to port_inited after calling pci_iomap(), bypassing the check for bmaddr being NULL. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- sound/pci/intel8x0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 2c5484e..dfb77a5 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -3101,13 +3101,13 @@ static int snd_intel8x0_create(struct snd_card *card, chip->bmaddr = pci_iomap(pci, 3, 0); else chip->bmaddr = pci_iomap(pci, 1, 0); + + port_inited: if (!chip->bmaddr) { dev_err(card->dev, "Controller space ioremap problem\n"); snd_intel8x0_free(chip); return -EIO; } - - port_inited: chip->bdbars_count = bdbars[device_type]; /* initialize offsets */ -- 2.1.0

2 1

[alsa-devel] [PATCH] ALSA: hda - simplify azx_has_pm_runtime
by David Henningsson 16 Apr '15

16 Apr '15

Because AZX_DCAPS_PM_RUNTIME is always defined as non-zero, the initial part of the expression can be skipped. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_controller.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index be1b7de..0efdb09 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -404,7 +404,7 @@ struct azx { ((chip)->ops->reg_readb((dev)->sd_addr + AZX_REG_##reg)) #define azx_has_pm_runtime(chip) \ - (!AZX_DCAPS_PM_RUNTIME || ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME)) + ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME) /* PCM setup */ static inline struct azx_dev *get_azx_dev(struct snd_pcm_substream *substream) -- 1.9.1

2 1

Re: [alsa-devel] [PATCH] ASoC: max98090: add shutdown callback for max98090
by Caesar Wang 16 Apr '15

16 Apr '15

在 2015年04月16日 10:41, Anish Kumar 写道: > 在 2015年04月16日 05:14, Anish Kumar 写道: >> 在 04/10/2015 03:38 AM, Anish Kumar 写道: >>>> To fix pop noise when shutdown,the pop noise during shutdown >>>> is the pmic cutoff power of codec without any notice. >>> Is the power turned off without any intimation to the codec driver? >>> Or is it physically removed? Can you describe the probelm >>> better? >>> When device is shutdown with playing music, the origin driver does nothing for shutdown operation, >>> as a result, pmic will cut off the power of codec IC, thus cause a pop noise from speaker and headphone. >>> So the patch added a shutdown callback for driver, enable volume smoothing and disable zero cross, >>> this is referenced from mic_input which does the samething before mic switch. >>> I'm very happy if some suggestion from maximintegrate . :-) >> Please let me know if the patch worked for you. >> Yes, the patch can work for me. > I hope this patch is what you tested. > > +static void max98090_i2c_shutdown(struct i2c_client *i2c) > +{ > + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); > + > + dev_info(&i2c->dev, "shut down device\n"); > + > + /* enable zero crossing */ > + regmap_write(max98090->regmap, > + M98090_REG_LEVEL_CONTROL, M98090_ZDENN_MASK-1); > + > + /* turn down volume levels for all the outputs */ > + regmap_write(max98090->regmap, > + M98090_REG_RCV_LOUTL_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_LOUTR_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_LEFT_SPK_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_RIGHT_SPK_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_LEFT_HP_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_RIGHT_HP_VOLUME, 0x00); > + regmap_write(max98090->regmap, > + M98090_REG_DEVICE_SHUTDOWN, 0x00); > + msleep(40); > +} > + > Please go ahead and submit to Mark. With the about is also useful to solve it. @zengxing, could you also help verify it? >> We had tested on chromiumos. >>> +static void max98090_i2c_shutdown(struct i2c_client *i2c) >>> +{ >>> + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); >>> + >>> + dev_info(&i2c->dev, "shut down device\n"); >>> + >>> + /* Enable volume smoothing, disable zero cross. This will cause >>> + * a quick 40ms ramp to mute on shutdown. >>> + */ >>> + regmap_write(max98090->regmap, >>> + M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK); >>> + regmap_write(max98090->regmap, >>> + M98090_REG_DEVICE_SHUTDOWN, 0x00); >>> + msleep(40); >>> +} >>> + >>> >>> >> >> >> > -- > ************************************************************************************** > 王晓腾 Caesar Wang > Product R&D Dept.III > Fuzhou Rockchip Electronics Co.Ltd > Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) > 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) > Tel：+86-591-83991906/07 - 8221 > Mobile:+86 15059456742 > E-mail : wxt(a)rock-chips.com > *************************************************************************************** > *************************************************************************************** > IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may > contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. > If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the > information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material > in its entirety in any format. Thank you. > *************************************************************************************** > -- ************************************************************************************** 王晓腾 Caesar Wang Product R&D Dept.III Fuzhou Rockchip Electronics Co.Ltd Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) Tel：+86-591-83991906/07 - 8221 Mobile:+86 15059456742 E-mail : wxt(a)rock-chips.com *************************************************************************************** *************************************************************************************** IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. ***************************************************************************************

1 0

Re: [alsa-devel] [PATCH] ASoC: max98090: add shutdown callback for max98090
by Caesar Wang 16 Apr '15

16 Apr '15

在 2015年04月16日 05:14, Anish Kumar 写道: > 在 04/10/2015 03:38 AM, Anish Kumar 写道: >>> To fix pop noise when shutdown,the pop noise during shutdown >>> is the pmic cutoff power of codec without any notice. >> Is the power turned off without any intimation to the codec driver? >> Or is it physically removed? Can you describe the probelm >> better? >> When device is shutdown with playing music, the origin driver does nothing for shutdown operation, >> as a result, pmic will cut off the power of codec IC, thus cause a pop noise from speaker and headphone. >> So the patch added a shutdown callback for driver, enable volume smoothing and disable zero cross, >> this is referenced from mic_input which does the samething before mic switch. >> I'm very happy if some suggestion from maximintegrate . :-) > Please let me know if the patch worked for you. Yes, the patch can work for me. We had tested on chromiumos. >> +static void max98090_i2c_shutdown(struct i2c_client *i2c) >> +{ >> + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); >> + >> + dev_info(&i2c->dev, "shut down device\n"); >> + >> + /* Enable volume smoothing, disable zero cross. This will cause >> + * a quick 40ms ramp to mute on shutdown. >> + */ >> + regmap_write(max98090->regmap, >> + M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK); >> + regmap_write(max98090->regmap, >> + M98090_REG_DEVICE_SHUTDOWN, 0x00); >> + msleep(40); >> +} >> + >> >> > > > > -- ************************************************************************************** 王晓腾 Caesar Wang Product R&D Dept.III Fuzhou Rockchip Electronics Co.Ltd Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) Tel：+86-591-83991906/07 - 8221 Mobile:+86 15059456742 E-mail : wxt(a)rock-chips.com *************************************************************************************** *************************************************************************************** IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. ***************************************************************************************

1 0

Re: [alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 15 Apr '15

15 Apr '15

Ok, last question about this topic: Is blocked snd_pcm_reading/writing both a. real time safe and b. does not "consume 100 percent cpu power", i.e. waits silently? Thanks for the help.

2 1

[alsa-devel] [PATCH] ASoC: Intel: Remove invalid kfree of devm allocated data
by Jin Yao 15 Apr '15

15 Apr '15

kbuild robot reports following warning: "sound/soc/intel/haswell/sst-haswell-ipc.c:2204:1-6: WARNING: invalid free of devm_ allocated data" As julia explains to me, the memory allocated with devm_kalloc is freed automatically on failure of a probe function. So this kfree should be removed otherwise the double free will be got in error handler path. Signed-off-by: Jin Yao <yao.jin(a)linux.intel.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9..324eceb 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: set dmaen->chan = NULL when error case
by Kuninori Morimoto 15 Apr '15

15 Apr '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> rsnd_dmaen_quit() is assuming dmaen->chan is NULL if it failed to get DMAEngine channel. but, current dmaen->chan might have error value when error case (this driver is checking it by IS_ERR_OR_NULL()) This patch makes sure dmaen->chan is NULL when error case. Otherwise, it will contact to unknown address in rsnd_dmaen_quit() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index ac3756f..144308f 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -156,6 +156,7 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, (void *)id); } if (IS_ERR_OR_NULL(dmaen->chan)) { + dmaen->chan = NULL; dev_err(dev, "can't get dma channel\n"); goto rsnd_dma_channel_err; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: qcom: Return an error for invalid PCM trigger command
by Takashi Iwai 15 Apr '15

15 Apr '15

Fix a compile warning sound/soc/qcom/lpass-cpu.c: In function ‘lpass_cpu_daiops_trigger’: sound/soc/qcom/lpass-cpu.c:224:2: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] return ret; ^ Although switch () lists the most of existing cases, it's still better to cover the rest as an error properly. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 6698d058de29..dc790abaa331 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -194,7 +194,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); - int ret; + int ret = -EINVAL; switch (cmd) { case SNDRV_PCM_TRIGGER_START: -- 2.3.5

3 2

[alsa-devel] [PATCH] ASoC: Add support for NAU8825 codec to ASoC
by Chih-Chiang Chang 15 Apr '15

15 Apr '15

The NAU88L25 is an ultra-low power high performance audio codec designed for smartphone, tablet PC, and other portable devices by Nuvoton, now add linux driver support for it. Signed-off-by: Chih-Chiang Chang <ccchang12(a)nuvoton.com> --- include/sound/nau8825_plat.h | 22 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/nau8825.c | 593 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 150 +++++++++++ 5 files changed, 772 insertions(+) create mode 100644 include/sound/nau8825_plat.h create mode 100644 sound/soc/codecs/nau8825.c create mode 100644 sound/soc/codecs/nau8825.h diff --git a/include/sound/nau8825_plat.h b/include/sound/nau8825_plat.h new file mode 100644 index 0000000..87afcd3 --- /dev/null +++ b/include/sound/nau8825_plat.h @@ -0,0 +1,22 @@ +/* + * linux/sound/snd_nau8825.h -- Platform data for NAU8825 + * + * Copyright 2015 Nuvoton Technology Corp. + * + * 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. + */ + +#ifndef __LINUX_SND_NAU8825_H +#define __LINUX_SND_NAU8825_H + +struct nau8825_platform_data { + unsigned int audio_mclk1; + unsigned int gpio_irq; + int naudint_irq; + int headset_detect; + int button_press_detect; +}; + +#endif diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0bddd92..8807c57 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C + select SND_SOC_NAU8825 if I2C select SND_SOC_HDMI_CODEC select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER @@ -464,6 +465,10 @@ config SND_SOC_MAX98357A config SND_SOC_MAX9850 tristate +config SND_SOC_NAU8825 + tristate "Nuvoton NAU8825 CODEC" + depends on I2C + config SND_SOC_PCM1681 tristate "Texas Instruments PCM1681 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 7acb6c1..acf594e 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -68,6 +68,7 @@ snd-soc-max98357a-objs := max98357a.o snd-soc-max9850-objs := max9850.o snd-soc-mc13783-objs := mc13783.o snd-soc-ml26124-objs := ml26124.o +snd-soc-nau8825-objs := nau8825.o snd-soc-hdmi-codec-objs := hdmi.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm1792a-codec-objs := pcm1792a.o @@ -252,6 +253,7 @@ obj-$(CONFIG_SND_SOC_MAX98357A) += snd-soc-max98357a.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o +obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM1792A) += snd-soc-pcm1792a-codec.o diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c new file mode 100644 index 0000000..a8c8f59 --- /dev/null +++ b/sound/soc/codecs/nau8825.c @@ -0,0 +1,593 @@ +/* + * linux/sound/soc/codecs/nau8825.c + * + * Copyright 2015 Nuvoton Technology Corp. + * Author: Meng-Huang Kuo <mhkuo(a)nuvoton.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. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/gpio.h> +#include <linux/device.h> +#include <linux/clk.h> +#include <linux/regmap.h> +#include <linux/acpi.h> +#include <asm/div64.h> +#include <sound/jack.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include <sound/tlv.h> +#include <linux/delay.h> +#include "nau8825.h" + +static int nau8825_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai); +static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt); +static int nau8825_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level); +static int nau8825_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir); +static const DECLARE_TLV_DB_SCALE(out_hp_vol_tlv, -5400, 100, 0); +static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, 2400, 50, 1); +static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -12800, 50, 0); + +static const struct snd_kcontrol_new nau8825_snd_controls[] = { + + SOC_SINGLE_TLV("MIC Volume", NAU8825_ADC_DGAIN_CTRL, + NAU8825_ADC_DGAIN_SFT, + NAU8825_ADC_VOL_RSCL_RANGE, 0, adc_vol_tlv), + SOC_DOUBLE_TLV("HP Volume", NAU8825_HSVOL_CTRL, + NAU8825_L_HSVOL_SFT, NAU8825_R_HSVOL_SFT, + NAU8825_VOL_RSCL_RANGE, 1, out_hp_vol_tlv), + SOC_DOUBLE("HP Playback Switch", NAU8825_HSVOL_CTRL, NAU8825_L_MUTE, + NAU8825_R_MUTE, 1, 1), + SOC_SINGLE("HP Class OP", NAU8825_CLASS_G_CTRL, NAU8825_CLASS_G_SHIFT, + 1, 0), + SOC_SINGLE("DAC Right", NAU8825_DAC_CTRL, NAU8825_DAC_R_SFT, 1, 0), + SOC_SINGLE("DAC Left", NAU8825_DAC_CTRL, NAU8825_DAC_L_SFT, 1, 0), + SOC_SINGLE("DAC Right Clock", NAU8825_DAC_CTRL, NAU8825_DAC_CLK_R_SFT, + 1, 0), + SOC_SINGLE("DAC Left Clock", NAU8825_DAC_CTRL, NAU8825_DAC_CLK_L_SFT, + 1, 0), +}; + +static const struct snd_kcontrol_new nau8825_hpo_mix[] = { + SOC_DAPM_SINGLE("HP L Switch", NAU8825_HSVOL_CTRL, + NAU8825_L_MUTE_SFT, 1, 1), + SOC_DAPM_SINGLE("HP R Switch", NAU8825_HSVOL_CTRL, + NAU8825_R_MUTE_SFT, 1, 1), +}; + +static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { + + SND_SOC_DAPM_INPUT("Mic Jack"), + SND_SOC_DAPM_MICBIAS("MIC BIAS", NAU8825_BOOST, NAU8825_G_BIAS_SFT, 0), + SND_SOC_DAPM_SUPPLY("micbias", SND_SOC_NOPM, 0, 0, + NULL, SND_SOC_DAPM_PRE_PMU + | SND_SOC_DAPM_POST_PMD), + SND_SOC_DAPM_SUPPLY("vmid", SND_SOC_NOPM, 0, 0, NULL, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), + /* ADCs */ + SND_SOC_DAPM_ADC("ADC L", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("ADC R", NULL, SND_SOC_NOPM, 0, 0), + /* ADC IF1 */ + SND_SOC_DAPM_PGA("IF1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0), + /* Audio Interface */ + SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0), + /* DACs */ + SND_SOC_DAPM_DAC_E("DAC L1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_L_SFT, 0, NULL, + SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_DAC_E("DAC R1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_R_SFT, 0, NULL, + SND_SOC_DAPM_PRE_PMD), + /* SPO/HPO/LOUT/Mono Mixer */ + SND_SOC_DAPM_MIXER("HPO MIX", SND_SOC_NOPM, 0, 0, nau8825_hpo_mix, + ARRAY_SIZE(nau8825_hpo_mix)), + SND_SOC_DAPM_PGA_S("HP amp", 1, NAU8825_CLASS_G_CTRL, + NAU8825_CLASS_G_SHIFT, 0, NULL, 0), + /* Output Lines */ + SND_SOC_DAPM_OUTPUT("HPOL"), + SND_SOC_DAPM_OUTPUT("HPOR"), +}; + +static const struct snd_soc_dapm_route nau8825_dapm_routes[] = { + + {"ADC L", NULL, "Mic Jack"}, + {"ADC R", NULL, "Mic Jack"}, + {"AIF1TX", NULL, "ADC L"}, + {"AIF1TX", NULL, "ADC R"}, + {"DAC L1", NULL, "AIF1RX"}, + {"DAC R1", NULL, "AIF1RX"}, + {"HPO MIX", "HP L Switch", "DAC L1"}, + {"HPO MIX", "HP R Switch", "DAC R1"}, + {"HP amp", NULL, "HPO MIX"}, + {"HPOL", NULL, "HP amp"}, + {"HPOR", NULL, "HP amp"}, +}; + +static int nau8825_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *tmp) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec *codec = rtd->codec; + unsigned int val_len = 0; + + switch (params_width(params)) { + case 16: + break; + case 20: + val_len |= NAU8825_I2S_DL_20; + break; + case 24: + val_len |= NAU8825_I2S_DL_24; + break; + case 32: + val_len |= NAU8825_I2S_DL_32; + break; + default: + return -EINVAL; + } + snd_soc_update_bits(codec, NAU8825_I2S_PCM_CTRL_1, + NAU8825_I2S_DL_MASK, val_len); + return 0; +} + +static int nau8825_dac_mute(struct snd_soc_dai *codec_dai, int mute) +{ + struct snd_soc_codec *codec = codec_dai->codec; + + if (mute) + snd_soc_update_bits(codec, NAU8825_DAC_MUTE_CTRL, + NAU8825_SOFT_MUTE_MASK, NAU8825_SOFT_MUTE_EN); + else + snd_soc_update_bits(codec, NAU8825_DAC_MUTE_CTRL, + NAU8825_SOFT_MUTE_MASK, NAU8825_SOFT_MUTE_DIS); + return 0; +} + +static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + unsigned int reg_val = 0; + + dev_dbg(codec->dev, " %s ###nau8825_set_dai_fmt %x\n", __func__, fmt); + /* interface format */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_NF: + reg_val |= NAU8825_I2S_BP_INV; + break; + default: + dev_alert(codec->dev, "Invalid DAI interface format\n"); + return -EINVAL; + } + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + reg_val |= NAU8825_I2S_DF_I2S; + break; + case SND_SOC_DAIFMT_LEFT_J: + reg_val |= NAU8825_I2S_DF_LEFT; + break; + case SND_SOC_DAIFMT_RIGHT_J: + reg_val |= NAU8825_I2S_DF_RIGHT; + break; + case SND_SOC_DAIFMT_DSP_A: + reg_val |= NAU8825_I2S_DF_PCM_A; + break; + case SND_SOC_DAIFMT_DSP_B: + reg_val |= NAU8825_I2S_DF_PCM_B; + reg_val |= NAU8825_I2S_PCMB_EN; + break; + default: + dev_alert(codec->dev, "Invalid DAI I2S/PCM format\n"); + return -EINVAL; + } + snd_soc_update_bits(codec, NAU8825_I2S_PCM_CTRL_1, + NAU8825_I2S_DL_MASK | NAU8825_I2S_DF_MASK + | NAU8825_I2S_BP_MASK | NAU8825_I2S_PCMB_MASK, + reg_val); + return 0; +} + +static void config_fll_clk_12m(struct snd_soc_codec *codec) +{ + snd_soc_update_bits(codec, NAU8825_CLK_DIVIDER, 0x000F, 0x0003); + snd_soc_update_bits(codec, NAU8825_FL_1, 0x007F, 0x0001); + snd_soc_write(codec, NAU8825_FL_2, 0xC49B); + snd_soc_update_bits(codec, NAU8825_FL_3, 0x03FF, 0x0020); + snd_soc_update_bits(codec, NAU8825_FL_4, 0x0C00, 0x0800); + snd_soc_update_bits(codec, NAU8825_FL_5, 0x2000, 0x0000); + snd_soc_update_bits(codec, NAU8825_FL_6, 0x4000, 0x4000); +} + +void set_sys_clk(struct snd_soc_codec *codec, int sys_clk) +{ + pr_debug("%s :: sys_clk=%x\n", __func__, sys_clk); + switch (sys_clk) { + case NAU8825_INTERNALCLOCK: + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x0853); + snd_soc_write(codec, NAU8825_FL_6, 0xE000); + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x8853); + break; + case NAU8825_MCLK: + default: + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x0853); + snd_soc_write(codec, NAU8825_FL_6, 0x6000); + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x8853); + break; + } +} + +static int nau8825_dai_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + + switch (clk_id) { + case NAU8825_MCLK: + config_fll_clk_12m(codec); + set_sys_clk(codec, clk_id); + break; + case NAU8825_INTERNALCLOCK: + set_sys_clk(codec, clk_id); + break; + default: + dev_err(codec->dev, "Wrong clock src\n"); + return -EINVAL; + } + return 0; +} + +static int nau8825_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + switch (level) { + case SND_SOC_BIAS_ON: + /* All power is driven by DAPM system*/ + dev_dbg(codec->dev, "###nau8825_set_bias_level BIAS_ON\n"); + snd_soc_update_bits(codec, NAU8825_BIAS_ADJ, + NAU8825_VMID_MASK, NAU8825_VMID_EN); + snd_soc_update_bits(codec, NAU8825_BOOST, + NAU8825_G_BIAS_MASK, NAU8825_G_BIAS_EN); + break; + case SND_SOC_BIAS_OFF: + dev_dbg(codec->dev, "###nau8825_set_bias_level OFF\n"); + set_sys_clk(codec, NAU8825_INTERNALCLOCK); + snd_soc_update_bits(codec, NAU8825_BIAS_ADJ, NAU8825_VMID_MASK, + NAU8825_VMID_DIS); + snd_soc_update_bits(codec, NAU8825_BOOST, + NAU8825_G_BIAS_MASK, NAU8825_G_BIAS_DIS); + break; + default: + break; + } + codec->dapm.bias_level = level; + dev_dbg(codec->dev, "## nau8825_set_bias_level %d\n", level); + return 0; +} + +static int nau8825_codec_suspend(struct snd_soc_codec *codec) +{ + nau8825_set_bias_level(codec, SND_SOC_BIAS_OFF); + return 0; +} + +static int nau8825_resume(struct snd_soc_codec *codec) +{ + nau8825_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + return 0; +} + +static const struct reg_default nau8825_reg[] = { + /* software reset */ + {0x0000, 0x0001}, + {0x0000, 0x0002}, + /* enable clock source */ + {0x0001, 0x07FF}, + /* enable VMID and Bias */ + {0x0076, 0x3140}, + /* setup clock divider */ + {0x0003, 0x0050}, + /* jack detection configuration */ + {0x000D, 0x00E0}, + {0x000F, 0x0801}, + {0x0012, 0x0010}, + /* keypad detection configuration */ + {0x0013, 0x0280}, + {0x0014, 0x7310}, + {0x0015, 0x050E}, + {0x0016, 0x1B2A}, + /* audio format configuration */ + {0x001A, 0x0800}, + {0x001C, 0x000E}, + {0x001D, 0x0010}, + /* sampling rate control */ + {0x002B, 0x0012}, + /* DAC sampling rate control */ + {0x002C, 0x0082}, + /* ADC and DAC mixer control */ + {0x0030, 0x00D2}, + {0x0033, 0x00CF}, + {0x0034, 0x02CF}, + /* DAC class-G control */ + {0x006A, 0x1003}, + {0x0050, 0x2007}, + /* ADC PGA control */ + {0x0072, 0x0260}, + /* DAC power down enabled */ + {0x0080, 0x03A0}, + /* enable DAC clock */ + {0x0073, 0x336C}, + /* enable MIC Bias */ + {0x0074, 0x5502}, + /* powerup output driver */ + {0x007F, 0x473C}, + {0x007F, 0x473F}, + /* DAC power down disabled */ + {0x0080, 0x00A0}, + /* adjust MIC Bias */ + {0x0066, 0x2060}, + {0x0066, 0x2060}, + {0x0066, 0x0060}, +}; + +static int nau8825_codec_probe(struct snd_soc_codec *codec) +{ + int i; + struct nau8825_priv *nau8825; + + nau8825 = snd_soc_codec_get_drvdata(codec); + nau8825->codec = codec; + /*writing initial register values to the codec*/ + for (i = 0; i < ARRAY_SIZE(nau8825_reg); i++) + snd_soc_write(codec, nau8825_reg[i].reg, nau8825_reg[i].def); + return 0; +} + +static int nau8825_codec_remove(struct snd_soc_codec *codec) +{ + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + regmap_write(nau8825->regmap, NAU8825_RESET, 0); + regmap_write(nau8825->regmap, NAU8825_RESET, 1); + return 0; +} + +static struct snd_soc_codec_driver soc_codec_driver_nau8825 = { + .probe = nau8825_codec_probe, + .remove = nau8825_codec_remove, + .suspend = nau8825_codec_suspend, + .resume = nau8825_resume, + .set_bias_level = nau8825_set_bias_level, + .controls = nau8825_snd_controls, + .num_controls = ARRAY_SIZE(nau8825_snd_controls), + .dapm_widgets = nau8825_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8825_dapm_widgets), + .dapm_routes = nau8825_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8825_dapm_routes), +}; + +static bool nau8825_readable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_RESET: + case NAU8825_ENA_CTRL: + case NAU8825_CLK_EN: + case NAU8825_CLK_DIVIDER: + case NAU8825_FL_1: + case NAU8825_FL_2: + case NAU8825_FL_3: + case NAU8825_FL_4: + case NAU8825_FL_5: + case NAU8825_FL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_SETTING_1: + case NAU8825_IRQ_STATUS: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_SETTING: + case NAU8825_SAR_ADC: + case NAU8825_VDET_COEFFICIENT: + case NAU8825_VDET_THRESHOLD_1: + case NAU8825_VDET_THRESHOLD_2: + case NAU8825_GPIO2_CTRL: + case NAU8825_I2S_PCM_CTRL_1: + case NAU8825_I2S_PCM_CTRL_2: + case NAU8825_ADC_RATE: + case NAU8825_DAC_CTRL1: + case NAU8825_DAC_CTRL2: + case NAU8825_ADC_DGAIN_CTRL: + case NAU8825_DAC_MUTE_CTRL: + case NAU8825_HSVOL_CTRL: + case NAU8825_DACL_CTRL: + case NAU8825_DACR_CTRL: + case NAU8825_SAR_ADC_OUTPUT: + case NAU8825_ANALOG_CTRL2: + case NAU8825_ANALOG_ADC_1: + case NAU8825_ANALOG_ADC_2: + case NAU8825_DAC_CTRL: + case NAU8825_MIC_BIAS: + case NAU8825_BOOST: + case NAU8825_CLASS_G_CTRL: + case NAU8825_BIAS_ADJ: + case NAU8825_POWER_UP_CTRL: + case NAU8825_CHARGE_BUMP: + return true; + default: + return false; + } +} + +static bool nau8825_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_RESET: + case NAU8825_ENA_CTRL: + case NAU8825_CLK_EN: + case NAU8825_CLK_DIVIDER: + case NAU8825_FL_1: + case NAU8825_FL_2: + case NAU8825_FL_3: + case NAU8825_FL_4: + case NAU8825_FL_5: + case NAU8825_FL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_SETTING_1: + case NAU8825_IRQ_STATUS: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_SETTING: + case NAU8825_SAR_ADC: + case NAU8825_VDET_COEFFICIENT: + case NAU8825_VDET_THRESHOLD_1: + case NAU8825_VDET_THRESHOLD_2: + case NAU8825_GPIO2_CTRL: + case NAU8825_I2S_PCM_CTRL_1: + case NAU8825_I2S_PCM_CTRL_2: + case NAU8825_ADC_RATE: + case NAU8825_DAC_CTRL1: + case NAU8825_DAC_CTRL2: + case NAU8825_ADC_DGAIN_CTRL: + case NAU8825_DAC_MUTE_CTRL: + case NAU8825_HSVOL_CTRL: + case NAU8825_DACL_CTRL: + case NAU8825_DACR_CTRL: + case NAU8825_SAR_ADC_OUTPUT: + case NAU8825_ANALOG_CTRL2: + case NAU8825_ANALOG_ADC_1: + case NAU8825_ANALOG_ADC_2: + case NAU8825_DAC_CTRL: + case NAU8825_MIC_BIAS: + case NAU8825_BOOST: + case NAU8825_CLASS_G_CTRL: + case NAU8825_BIAS_ADJ: + case NAU8825_POWER_UP_CTRL: + case NAU8825_CHARGE_BUMP: + return true; + default: + return false; + } +} + +static const struct regmap_config nau8825_regmap = { + .reg_bits = 16, + .val_bits = 16, + .use_single_rw = true, + .max_register = NAU8825_MAX_REGISTER, + .volatile_reg = nau8825_volatile_register, + .readable_reg = nau8825_readable_register, + .cache_type = REGCACHE_RBTREE, + .reg_defaults = nau8825_reg, + .num_reg_defaults = ARRAY_SIZE(nau8825_reg), +}; + +static struct snd_soc_dai_ops nau8825_dai_ops = { + .hw_params = nau8825_hw_params, + .set_sysclk = nau8825_dai_set_sysclk, + .set_fmt = nau8825_set_dai_fmt, + .digital_mute = nau8825_dac_mute, +}; + +static struct snd_soc_dai_driver nau8825_dai_driver[] = { + { + .name = "nau8825-aif1", + .playback = { + .stream_name = "AIF1 Playback", + .channels_min = 1, + .channels_max = 2, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .capture = { + .stream_name = "AIF1 Capture", + .channels_min = 1, + .channels_max = 2, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .ops = &nau8825_dai_ops, + } +}; + + +static int nau8825_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *i2c_id) +{ + struct nau8825_platform_data *pdata = dev_get_platdata(&i2c->dev); + struct nau8825_priv *nau8825; + int ret; + + nau8825 = devm_kzalloc(&i2c->dev, sizeof(struct nau8825_priv), + GFP_KERNEL); + if (nau8825 == NULL) + return -ENOMEM; + nau8825->i2c = i2c; + i2c_set_clientdata(i2c, nau8825); + if (pdata) + nau8825->pdata = *pdata; + nau8825->regmap = devm_regmap_init_i2c(i2c, &nau8825_regmap); + if (IS_ERR(nau8825->regmap)) { + ret = PTR_ERR(nau8825->regmap); + dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); + goto err_enable; + } + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_driver_nau8825, + nau8825_dai_driver, + ARRAY_SIZE(nau8825_dai_driver)); +err_enable: + return ret; +} + +static int nau8825_i2c_remove(struct i2c_client *i2c) +{ + snd_soc_unregister_codec(&i2c->dev); + return 0; +} + +static const struct i2c_device_id nau8825_i2c_id[] = { + {"nau8825", 0}, + { } +}; +MODULE_DEVICE_TABLE(i2c, nau8825_i2c_id); + +static const struct acpi_device_id nau8825_acpi_match[] = { + { "10508825", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, nau8825_acpi_match); + +static struct i2c_driver nau8825_i2c_driver = { + .driver = { + .name = "nau8825", + .owner = THIS_MODULE, + .acpi_match_table = ACPI_PTR(nau8825_acpi_match), + }, + .probe = nau8825_i2c_probe, + .remove = (nau8825_i2c_remove), + .id_table = nau8825_i2c_id, +}; +module_i2c_driver(nau8825_i2c_driver); + +MODULE_DESCRIPTION("ASoC NAU8825 codec driver"); +MODULE_AUTHOR("Nuvoton"); +MODULE_LICENSE("GPL v2"); + + diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h new file mode 100644 index 0000000..b16d4d1 --- /dev/null +++ b/sound/soc/codecs/nau8825.h @@ -0,0 +1,150 @@ +/* + * linux/sound/soc/codecs/nau8825.h + * + * Copyright 2015 Nuvoton Technology Corp. + * Author: Meng-Huang Kuo <mhkuo(a)nuvoton.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. + */ + +#ifndef _NAU8825_H +#define _NAU8825_H + +#include <sound/nau8825_plat.h> + +#define NAU8825_RESET 0x00 +#define NAU8825_ENA_CTRL 0x01 +#define NAU8825_CLK_EN 0x02 +#define NAU8825_CLK_DIVIDER 0x03 +#define NAU8825_FL_1 0x04 +#define NAU8825_FL_2 0x05 +#define NAU8825_FL_3 0x06 +#define NAU8825_FL_4 0x07 +#define NAU8825_FL_5 0x08 +#define NAU8825_FL_6 0x09 +#define NAU8825_HEADSET_CTRL 0x0C +#define NAU8825_JACK_DET_CTRL 0x0D +#define NAU8825_IRQ_SETTING_1 0x0F +#define NAU8825_IRQ_STATUS 0x10 +#define NAU8825_IRQ_CLEAR 0x11 +#define NAU8825_IRQ_SETTING 0x12 +#define NAU8825_SAR_ADC 0x13 +#define NAU8825_VDET_COEFFICIENT 0x14 +#define NAU8825_VDET_THRESHOLD_1 0x15 +#define NAU8825_VDET_THRESHOLD_2 0x16 +#define NAU8825_GPIO2_CTRL 0x1A +#define NAU8825_I2S_PCM_CTRL_1 0x1C +#define NAU8825_I2S_PCM_CTRL_2 0x1D +#define NAU8825_ADC_RATE 0x2B +#define NAU8825_DAC_CTRL1 0x2C +#define NAU8825_DAC_CTRL2 0x2D +#define NAU8825_ADC_DGAIN_CTRL 0x30 +#define NAU8825_DAC_MUTE_CTRL 0x31 +#define NAU8825_HSVOL_CTRL 0x32 +#define NAU8825_DACL_CTRL 0x33 +#define NAU8825_DACR_CTRL 0x34 +#define NAU8825_CLASS_G_CTRL 0x50 +#define NAU8825_SAR_ADC_OUTPUT 0x59 +#define NAU8825_BIAS_ADJ 0x66 +#define NAU8825_ANALOG_CTRL2 0x6A +#define NAU8825_ANALOG_ADC_1 0x71 +#define NAU8825_ANALOG_ADC_2 0x72 +#define NAU8825_DAC_CTRL 0x73 +#define NAU8825_MIC_BIAS 0x74 +#define NAU8825_BOOST 0x76 +#define NAU8825_POWER_UP_CTRL 0x7F +#define NAU8825_CHARGE_BUMP 0x80 +#define NAU8825_MAX_REGISTER 0xFF + +/* reg. NAU8825_I2S_PCM_CTRL_1 (0x1C) */ +#define NAU8825_I2S_BP_MASK (0x1 << 7) +#define NAU8825_I2S_BP_INV (0x1 << 7) +#define NAU8825_I2S_PCMB_MASK (0x1 << 6) +#define NAU8825_I2S_PCMB_EN (0x1 << 6) +#define NAU8825_I2S_DL_MASK (0x3 << 2) +#define NAU8825_I2S_DF_MASK 0x3 +#define NAU8825_I2S_DF_RIGHT 0x0 +#define NAU8825_I2S_DF_LEFT 0x1 +#define NAU8825_I2S_DF_I2S 0x2 +#define NAU8825_I2S_DF_PCM_A 0x3 +#define NAU8825_I2S_DF_PCM_B 0x3 + +/* reg. NAU8825_I2S_PCM_CTRL_2 (0x1D) */ +#define NAU8825_I2S_MS_MASK (0x1 << 3) + +/* reg. NAU8825_ADC_DGAIN_CTRL (0x30) */ +#define NAU8825_ADC_DGAIN_SFT 0 + +/* reg. NAU8825_DAC_MUTE_CTRL (0x31) */ +#define NAU8825_SOFT_MUTE_MASK (0x1 << 13) +#define NAU8825_SOFT_MUTE_EN (0x1 << 13) +#define NAU8825_SOFT_MUTE_DIS (0x0 << 13) + +/* reg. NAU8825_HSVOL_CTRL (0x32) */ +#define NAU8825_R_MUTE (0x1 << 15) +#define NAU8825_R_MUTE_SFT 15 +#define NAU8825_L_MUTE (0x1 << 14) +#define NAU8825_L_MUTE_SFT 14 +#define NAU8825_L_HSVOL_SFT 6 +#define NAU8825_R_HSVOL_SFT 0 + +/* reg. NAU8825_CLASS_G_CTRL (0x50) */ +#define NAU8825_CLASS_G_RIGHT_SHIFT 2 +#define NAU8825_CLASS_G_LEFT_SHIFT 1 +#define NAU8825_CLASS_G_SHIFT 0 + +/* reg. NAU8825_BIAS_ADJ_2 (0x66) */ +#define NAU8825_VMID_MASK (0x1 << 6) +#define NAU8825_VMID_EN (0x1 << 6) +#define NAU8825_VMID_DIS (0x0 << 6) + +/* reg. NAU8825_DAC_CTRL (0x73) */ +#define NAU8825_DAC_R_SFT 13 +#define NAU8825_DAC_L_SFT 12 +#define NAU8825_DAC_CLK_R_SFT 9 +#define NAU8825_DAC_CLK_L_SFT 8 + +/* reg. NAU8825_BOOST (0x76) */ +#define NAU8825_G_BIAS_MASK (0x1 << 12) +#define NAU8825_G_BIAS_SFT 12 +#define NAU8825_G_BIAS_EN (0x1 << 12) +#define NAU8825_G_BIAS_DIS (0x0 << 12) + +/* Volume Rescale */ +#define NAU8825_VOL_RSCL_RANGE 0x36 +#define NAU8825_ADC_VOL_RSCL_RANGE 0x256 + +/* Data format */ +#define NAU8825_I2S_DL_16 (0x0 << 2) +#define NAU8825_I2S_DL_20 (0x1 << 2) +#define NAU8825_I2S_DL_24 (0x2 << 2) +#define NAU8825_I2S_DL_32 (0x3 << 2) + +enum { + NAU8825_INTERNALCLOCK = 0, + NAU8825_MCLK, +}; + +#define NAU8825_RATES SNDRV_PCM_RATE_8000_192000 +#define NAU8825_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE \ + | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) + +struct nau8825_priv { + struct snd_soc_codec *codec; + struct nau8825_platform_data pdata; + struct regmap *regmap; + struct i2c_client *i2c; + struct snd_soc_jack *hp_jack; + struct snd_soc_jack *mic_jack; + struct delayed_work delayed_work; + + struct workqueue_struct *workqueue; + struct mutex mutex; + unsigned int irq; + bool jd_status; + bool bp_status; + int jack_type; +}; +#endif /* _NAU8825_H */ -- 1.9.3 --- Avast 防毒軟體已檢查此封電子郵件的病毒。 http://www.avast.com

2 2

Re: [alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 15 Apr '15

15 Apr '15

> Of course. Not only does this page say so: > http://www.alsa-project.org/main/index.php/SMP_Design Ah, I read this, but that's probably just if two threads would share one handle: "The use of returned handles must be serialized in the application using own locking scheme." One more question: You said snd_pcm_wait() was real time safe. I guess that's also true for similar functions, like snd_pcm_htimestamp(), snd_pcm_readi(), ..., correct?

2 1

[alsa-devel] recording problem in beagleboard-mcbsp
by noman pouigt 15 Apr '15

15 Apr '15

Problem: not able to record with any of the devices in beagleboard-xm. Analysis: userspace is stuck in snd_pcm_readi function and kernel space i don't see snd_pcm_update_hw_ptr function being called. Checked the I2S clocks and they are perfect and recording data line is moving based on the data. I am able to do playback though. I am using below command to do recording. Do i need to add additional switches? Linux kernel: 3.19 root@arm:~# arecord -t wav -c 2 -r 44100 -f S32_LE -v test.wav Recording WAVE 'test.wav' : Signed 32 bit Little Endian, Rate 44100 Hz, Stereo Plug PCM: Linear conversion PCM (S16_LE) Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S32_LE subformat : STD channels : 2 rate : 44100 exact rate : 44100 (44100/1) msbits : 32 buffer_size : 27560 period_size : 5512 period_time : 124988 tstamp_mode : NONE period_step : 1 avail_min : 5512 period_event : 0 start_threshold : 1 stop_threshold : 27560 silence_threshold: 0 silence_size : 0 boundary : 1806172160 Slave: Hardware PCM card 0 'omap3beagle' device 0 subdevice 0 Its setup is: stream : CAPTURE access : MMAP_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 44100 exact rate : 44100 (44100/1) msbits : 16 buffer_size : 27560 period_size : 5512 period_time : 124988 tstamp_mode : NONE period_step : 1 avail_min : 5512 period_event : 0 start_threshold : 1 stop_threshold : 27560 silence_threshold: 0 silence_size : 0 boundary : 1806172160 appl_ptr : 0 hw_ptr : 0 [ 74.696319] omap-mcbsp 48074000.mcbsp: **** McBSP255 regs **** [ 74.696380] omap-mcbsp 48074000.mcbsp: DRR2: 0xedd0abce [ 74.696411] omap-mcbsp 48074000.mcbsp: DRR1: 0x0000 [ 74.696441] omap-mcbsp 48074000.mcbsp: DXR2: 0x0000 [ 74.696472] omap-mcbsp 48074000.mcbsp: DXR1: 0x0000 [ 74.696502] omap-mcbsp 48074000.mcbsp: SPCR2: 0x0230 [ 74.696533] omap-mcbsp 48074000.mcbsp: SPCR1: 0x0031 [ 74.696563] omap-mcbsp 48074000.mcbsp: RCR2: 0x8041 [ 74.696594] omap-mcbsp 48074000.mcbsp: RCR1: 0x0040 [ 74.696594] omap-mcbsp 48074000.mcbsp: XCR2: 0x8041 [ 74.696624] omap-mcbsp 48074000.mcbsp: XCR1: 0x0040 [ 74.696655] omap-mcbsp 48074000.mcbsp: SRGR2: 0x001f [ 74.696685] omap-mcbsp 48074000.mcbsp: SRGR1: 0x0f00 [ 74.696716] omap-mcbsp 48074000.mcbsp: PCR0: 0x000f setup: beagleoboard-xm ubuntu distribution arecord used jaroslav recording application also tried

3 24

Re: [alsa-devel] Playback - Overwrite buffer with silence
by Nilhcraiv 15 Apr '15

15 Apr '15

Clemens wrote: It is impossible for the boundar to be zero. In my code snd_pcm_sw_params_get_boundary(swparams, &boundary) function does not return a negative value and the boundary variable is set to zero then, the boundar is zero. In any case, How I can put silence in buffer to avoid underrun? Do you know the answer? Thank you in advance.

3 4

Re: [alsa-devel] [PATCH 1/1] ASoC: fsl_sai: Add missing MODULE_DEVICE_TABLE
by Nicolin Chen 15 Apr '15

15 Apr '15

On Tue, Apr 14, 2015 at 11:33:27AM +0200, Alexander Stein wrote: > This enables module auto-loading when using device tree. > > Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> > --- > sound/soc/fsl/fsl_sai.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index ec79c3d..1fe9f5d 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -673,6 +673,7 @@ static const struct of_device_id fsl_sai_ids[] = { > { .compatible = "fsl,imx6sx-sai", }, > { /* sentinel */ } > }; > +MODULE_DEVICE_TABLE(of, fsl_sai_ids); > > static struct platform_driver fsl_sai_driver = { > .probe = fsl_sai_probe, > -- > 2.0.5 >

1 0

[alsa-devel] alsa-announce list not used anymore?
by Tanu Kaskinen 14 Apr '15

14 Apr '15

Hi, I was thinking of subscribing to alsa-announce, but it seems that there have been no messages sent there in years. Is it ok if I remove the list from the wiki page at http://alsa-project.org/main/index.php/Mailing-lists ? Hmm... it seems that the wiki page has many other obsolete lists too... Is it so that only alsa-user and alsa-devel are relevant nowadays? -- Tanu

1 0

Re: [alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 14 Apr '15

14 Apr '15

> > 1.) Let each thread open a handle using snd_seq_open() > > 2.) Call snd_pcm_wait() in each thread > > > > Are these functions > > > > a) real time safe? > > snd_seq_open() is not, but why would that matter? > Don't you call it from the GUI thread? Ah, indeed, seq_open() is part of the initialization, so for this one, it does not matter. > > b) race-condition free, assuming I'll use pairwise different handles > > each thread > Yes. You're really 100 percent sure that this is guaranteed to work? Sorry for asking this :) I was expecting a "No, of course not.". Also, this will probably work for all handle-based-functions, as long as you keep using pairwise different handles? Regards, Johannes

2 1

[alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 14 Apr '15

14 Apr '15

Hello, I'd like to write a sequencer that can handle many synthesizers. Thus, I want them to run these synths parallel. Still, I'd like to keep my code real time safe, i.e. no malloc(), usleep(), ofstream, pthread mutexes etc. However, I wondered how to let all my threads sleep for x useconds if there's nothing to do for x useconds. My idea was: 1.) Let each thread open a handle using snd_seq_open() 2.) Call snd_pcm_wait() in each thread Are these functions a) real time safe? b) race-condition free, assuming I'll use pairwise different handles each thread Many thanks for any help. Kind regards, Johannes

2 1

[alsa-devel] [PATCH] ALSA: hda - not use regmap for vendor verb 0x781 of Intel HDMI codec
by mengdong.lin＠intel.com 14 Apr '15

14 Apr '15

From: Mengdong Lin <mengdong.lin(a)intel.com> For HDMI codec on Haswell/Broadwell/Skylake platforms, the vendor verb 0x781 is used enable DP 1.2 mode as a fixup if BIOS has not done this, in function intel_haswell_fixup_enable_dp12(). Otherwise, the display audio playback will be silent. Although the verb 0x781 is added to vendor verbs array, but snd_hdac_regmap_ encode_verb() will translate it to verb 0xf81 and cause regmap_write IO failure because 0xf81 is not in the vendor verb array and so will not be taken as a writable register. So this patch no longer uses regmap for verb 0x781 but directly send this command to enable DP1.2 mode. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index ca0c05e..1849c94 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2298,8 +2298,7 @@ static void intel_haswell_fixup_enable_dp12(struct hda_codec *codec) /* enable DP1.2 mode */ vendor_param |= INTEL_EN_DP12; - snd_hdac_regmap_add_vendor_verb(&codec->core, INTEL_SET_VENDOR_VERB); - snd_hda_codec_write_cache(codec, INTEL_VENDOR_NID, 0, + snd_hda_codec_read(codec, INTEL_VENDOR_NID, 0, INTEL_SET_VENDOR_VERB, vendor_param); } -- 1.9.1

3 6

[alsa-devel] [RFC 00/11] ASoC: hda - Add ASoC Skylake HD audio driver
by Subhransu S. Prusty 14 Apr '15

14 Apr '15

This series of 11 patches adds support for ASoC Skylake HD Audio driver. Modified the hda core bus framework to support id_table match for ASoC DEV type instead of adding new wrapper. So dropped below RFC [RFC 3/3] ALSA: hda - add soc hda bus wrapper from the series [RFC 0/3] ALSA: Add soc hda bus support Jeeja KP (11): ALSA: hda - add id table support for hdac device/driver ALSA: hda - Add generic helper function to register/unregister driver ALSA: hda - add generic function to unregister all devices on bus ALSA: hda: corrected snd_hdac_stream_init() declaration ALSA: hda - exported link_reset enter/exit ALSA: hda - moved alloc/free stream pages function to controller library ALSA: hda - add generic functions to set hdac stream params ASoC: hda - add Skylake platform driver ALSA: hda - moved interrupt handler to controller library ASoC: hda - add Skylake HD audio driver ASoC: hda - enable ASoC Skylake HD audio driver include/sound/hdaudio.h | 43 ++- sound/hda/hda_bus_type.c | 2 + sound/hda/hdac_bus.c | 55 +++ sound/hda/hdac_controller.c | 78 ++++- sound/hda/hdac_stream.c | 29 ++ sound/soc/Kconfig | 3 +- sound/soc/Makefile | 1 + sound/soc/hda/Kconfig | 29 ++ sound/soc/hda/Makefile | 6 + sound/soc/hda/hda_skl.c | 829 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/hda/hda_skl.h | 49 +++ sound/soc/hda/hda_skl_pcm.c | 501 ++++++++++++++++++++++++++ 12 files changed, 1619 insertions(+), 6 deletions(-) create mode 100644 sound/soc/hda/Kconfig create mode 100644 sound/soc/hda/Makefile create mode 100644 sound/soc/hda/hda_skl.c create mode 100644 sound/soc/hda/hda_skl.h create mode 100644 sound/soc/hda/hda_skl_pcm.c -- 1.9.0

3 30

[alsa-devel] [RFC 0/3] ALSA: Add soc hda bus support
by Vinod Koul 14 Apr '15

14 Apr '15

This series of 3 patches adds support for ASoC HDA bus. ASoC HDA bus is essentially a wrapper for HDA core bus and it manages ASoC hda drivers Ramesh Babu (3): ALSA: hda - remove assigning dev type inside core ALSA: hda - add ASoC device type for hda core ALSA: hda - add soc hda bus wrapper include/sound/hdaudio.h | 1 + include/sound/soc-hdac-bus.h | 103 +++++++++++++++++++ sound/hda/hdac_device.c | 1 - sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/hda/Kconfig | 4 + sound/soc/hda/Makefile | 3 + sound/soc/hda/soc-hdac-bus.c | 233 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 346 insertions(+), 1 deletion(-) create mode 100644 include/sound/soc-hdac-bus.h create mode 100644 sound/soc/hda/Kconfig create mode 100644 sound/soc/hda/Makefile create mode 100644 sound/soc/hda/soc-hdac-bus.c -- 1.7.9.5

5 9

[alsa-devel] [GIT PULL] ASoC updates for v4.1
by Mark Brown 13 Apr '15

13 Apr '15

The following changes since commit f22e6e847115abc3a0e2ad7bb18d243d42275af1: Linux 4.0-rc7 (2015-04-06 15:39:45 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.1-2 for you to fetch changes up to 7667428f80526d908124e0647ac5dbe3dad88900: Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic/wm8731', 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next (2015-04-12 19:49:22 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.1 More updates for v4.1, pretty much all drivers: - Lots of cleanups from Lars, mainly moving things from the CODEC level to the card level. - Continuing improvements to rcar from Morimoto-san, pcm512x from Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han, and to rt5670 from Bard. - Support for some non-DSP Qualcomm platforms, Google's Storm platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC. ---------------------------------------------------------------- Alexandre Belloni (2): ASoC: atmel-pcm-pdc: merge atmel-pcm back in ASoC: atmel-pcm-dma: increase buffer_bytes_max Anish Kumar (2): ASoC: Add max98925 codec driver ASoC: max98925: trivial duplicate typo fix in set_fmt Arnd Bergmann (2): ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency ASoC: rnsd: fix build regression without CONFIG_OF Axel Lin (1): ASoC: max98925: Fix bit-width 24 settings in max98925_dai_hw_params Bard Liao (18): ASoC: rt5670: Add disabled item in dmic pin enum ASoC: rt5670: set platform data by dmi ASoC: rt5670: Add runtime PM support ASoC: rt5670: Keep sysclk on if JD func is used ASoC: rt5670: redefine ASRC control registers 0x84 and 0x85 ASoC: rt5670: Fix the speaker mono output issue ASoC: rt5670: Revert Keep sysclk on patch ASoC: rt5670: Check sysclk source by private data ASoC: rt5670: Add IRQ function ASoC: rt5670: export jack suspend/resume APIs ASoC: rt5645: Add TDM support for rt5650 ASoC: rt5645: Remove adc stereo2 filter ASoC: rt286: check regmap_read result for ID check ASoC: rt5645: Redefine format config for rt5650 ASoC: rt5645: Set use_single_rw flag for regmap ASoC: rt5645: Use update_bits for bit control ASoC: rt5645: Restore HP depop setting in HP off ASoC: rt286: Restore default in probe Caesar Wang (1): ASoC: max98090: add shutdown callback for max98090 Charles Keepax (12): ASoC: wm_adsp: Improve round to next 4-byte boundary ASoC: wm8804: Split out bus drivers ASoC: wm8804: Merge CODEC probe and bus probe regulator: core: Add devres versions of notifier registration ASoC: wm8804: Use new devres regulator_register_notifier ASoC: wm8804: Fix small issues in probe error paths ASoC: wm8804: Update DT binding document to cover regulator supplies ASoC: dapm: Fix build warning ASoC: wm5102: Remove set of volume update bits for output 3R ASoC: wm8804: Add support for hardware reset line ASoC: wm8804: Update binding documentation to include reset GPIO ASoC: wm8804: Enable runtime PM Dan Carpenter (1): ASoC: Intel: do cast earlier in sst_cdev_tstamp() Dmitry Torokhov (2): ASoC: cx20442: remove incorerct __exit markups ASoC: tlv320aic23: remove incorrect __exit markups Fabian Frederick (6): ASoC: fsl: constify of_device_id array ASoC: kirkwood: constify of_device_id array ASoC: rt5631: constify of_device_id array ASoC: ak4554: constify of_device_id array ASoC: fsi: constify of_device_id array ASoC: rsnd: constify of_device_id array Fabio Estevam (3): ASoC: fsl_ssi: Use devm_snd_soc_register_component() ASoC: fsl_ssi: Use devm_ioremap_resource() ASoC: fsl: Add the audio interface acronyms in Kconfig text Fang, Yang A (2): ALSA: Add params_set_format helper ASoC: Intel: fix machine driver warnings Geert Uytterhoeven (1): ASoC: rsnd: Use %pad to print dma_addr_t in rsnd_dmapp_init() Howard Mitchell (5): ALSA: ControlName.txt: Add 'Analogue' as a prefix for volume controls ASoC: pcm512x: Add 'Analogue' prefix to analogue volume controls ASoC: pcm512x: Fix divide by zero issue ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 Jarkko Nikula (2): ASoC: Intel: Remove support for Intel MID DMA from firmware loader ASoC: Intel: Remove vague commit about slave DMA config from firmware loader Jie Yang (9): ASoC: rt286: add jack detection disable with NULL jack passed ASoC: rt286: correct the OR to AND ASoC: Intel: Add suspend_pre and resume_post for Broadwell snd_soc_card ASoC: Intel: create common folder and move common files in ASoC: Intel: create haswell folder and move haswell platform files in ASoC: Intel: create boards folder and move sst boards files in ASoC: Intel: create baytrail folder and move baytrail platform files in ASoC: Intel: create atom folder and move atom platform files in ASoC: Intel: Fix a buffer overflow issue Jin Yao (6): ASoC: Intel: move sysclk source setting to platform_clock_control for balance. ASoC: Intel: Add suspend_pre and resume_post for Braswell snd_soc_card ASoC: Intel: move the jack creation to Braswell machine driver ASoC: Intel: Refactor common IPC/mailbox code into generic APIs ASoC: Intel: Use the generic IPC/mailbox APIs in Baytrail ASoC: Intel: Use the generic IPC/mailbox APIs in Broadwell Julia Lawall (1): ASoC: ab8500-codec: don't export static symbol Jyri Sarha (4): ASoC: omap-pcm: Allow only formats with 1, 2, and 4 byte physical size ASoC: davinci-mcasp: Set rule constraints if implicit BCLK divider is used ASoC: omap-hdmi-audio: No not use IEC958_AES1_PRO_MODE_NOTID ASoC: davinci-mcasp: Index ruledata in drvdata with substream->stream Kenneth Westfield (13): ASoC: max98357a: Remove use of DRV_NAME ASoC: max98357a: Use standard DAI names ASoC: qcom: add LPASS header files ASoC: qcom: Add LPASS CPU DAI driver ASoC: qcom: Add LPASS platform driver ASoC: qcom: Document LPASS CPU bindings MAINTAINERS: Add QCOM audio ASoC maintainer ASoC: qcom: Change qcom,adsp in LPASS CPU bindings ASoC: qcom: Modify test for DSP in LPASS driver ASoC: qcom: Document Storm bindings ASoC: qcom: Add Storm machine driver ASoC: qcom: Add ability to build QCOM drivers ASoC: Allow for building QCOM drivers Krzysztof Kozlowski (2): ASoC: max98925: Constify regmap config and other codec data ASoC: rsnd: Fix duplicate const for DVC ramp rates Kuninori Morimoto (41): dmaengine: export symbol of of_dma_request_slave_channel() ASoC: rsnd: remove SH-DMA-BASE specific implementation ASoC: rsnd: remove un-needed parameter from rsnd_dma_init() ASoC: rsnd: remove unused rsnd_dma_available() ASoC: rsnd: remove un-needed parameter from rsnd_dma_quit() ASoC: rsnd: tidyup rsnd_dma_to_mod() macro declaration position ASoC: rsnd: enable to get resource by name ASoC: rsnd: add rsnd_gen_get_phy_addr() to get physical address ASoC: rsnd: add dma.c for Audio DMAC / Audio DMAC peri peri ASoC: rsnd: move rsnd_gen_dma_addr() from gen.c to dma.c ASoC: rsnd: enable to care 1st / 2nd DMAC on rsnd_dma_xxx() ASoC: rsnd: add Audio DMAC peri peri support rework ASoC: rsnd: remove rsnd_dma::addr ASoC: rsnd: remove rsnd_dma::dir ASoC: rsnd: use union with rsnd_dmaen / rsnd_dmapp ASoC: rsnd: enable rsnd_ssi_use_busif() for DMA ASoC: rsnd: ssi: add rsnd_ssi_of_node() ASoC: rsnd: src: add rsnd_src_of_node() ASoC: rsnd: dvc: add rsnd_dvc_of_node() ASoC: rsnd: 1st DMAC dma-names cares subnode ASoC: rsnd: add sample code of rcar_sound,src irq ASoC: rsnd: add sample code of missing clocks ASoC: rsnd: add sample code of dma entry ASoC: rsnd: add sample code of reg-names ASoC: rsnd: recover PIO mode for new dma interface ASoC: rsnd: add regmap_config::name for debugfs ASoC: ak4642: tidyup DAPM route for playback ASoC: rsnd: no more SSI restart when unusual situation ASoC: rsnd: no more SRC restart when unusual situation ASoC: rsnd: tidyup error message format ASoC: rsnd: show debug info for sampling rate convert ASoC: rsnd: add dai_link stream name ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card() ASoC: rsrc-card: add Renesas sampling rate convert sound card support ASoC: rsrc-card: add .be_hw_params_fixup support for convert rate ASoC: rsnd: call clk_prepare/unprepare() in probe/remove ASoC: rsnd: remove useless debug message ASoC: rsnd: add DPCM based sampling rate convert ASoC: rsnd: add Synchronous SRC mode ASoC: ak4642: fixup channels_min ASoC: core: call snd_soc_runtime_set_dai_fmt() before soc_new_pcm() Lars-Peter Clausen (61): ASoC: sn95031: Pass CODEC to sn95031_jack_detection() ASoC: Allow to register jacks at the card level ASoC: simple-card: Register jacks at the card level ASoC: imx-es8328: Register jacks at the card level ASoC: wm1133-ev: Register jacks at the card level ASoC: broadwell: Register jacks at the card level ASoC: byt-max98090: Register jacks at the card level ASoC: cht_bsw_rt5645: Register jacks at the card level ASoC: mfld_machine: Register jacks at the card level ASoC: ams-deltea: Register jacks at the card level ASoC: omap-abe-twl6040: Register jacks at the card level ASoC: omap-twl4030: Register jacks at the card level ASoC: rx51: Register jacks at the card level ASoC: hx4700: Register jacks at the card level ASoC: palm27x: Register jacks at the card level ASoC: ttc-dkb: Register jacks at the card level ASoC: z2: Register jacks at the card level ASoC: h1980_uda1380: Register jacks at the card level ASoC: littlemill: Register jacks at the card level ASoC: lowland: Register jacks at the card level ASoC: rx1950_uda1380: Register jacks at the card level ASoC: smartq: Register jacks at the card level ASoC: speyside: Register jacks at the card level ASoC: tobermory: Register jacks at the card level ASoC: tegra_alc5632: Register jacks at the card level ASoC: tegra_max98090: Register jacks at the card level ASoC: tegra_rt5640: Register jacks at the card level ASoC: tegra_rt5677: Register jacks at the card level ASoC: tegra_wm8903: Register jacks at the card level ASoC: Remove snd_soc_jack_new() ASoC: Remove unnecessary device_remove_file() ASoC: rt5670: Replace w->codec snd_soc_dapm_to_codec(w->dapm) ASoC: Make snd_soc_dapm_kcontrol_codec() inline ASoC: nuc900: No need to track the dma buffer in the driver state struct ASoC: rt286: Drop unnecessary dapm bias_level initialization ASoC: wm2200: Drop unnecessary dapm bias_level initialization ARM: shmobile: armadillo800eva: Properly specify HDMI audio link format ARM: shmobile: armadillo800eva: fix clock inversion ASoC: simple-card: Remove support for setting differing DAI formats ASoC: wm8971: Use system_power_efficient_wq instead of custom workqueue ASoC: wm8971: Integrate capacitor charging into the DAPM sequence ASoC: wm8971: Cleanup manual bias level transitions ASoC: wm8753: Integrate capacitor charging into the DAPM sequence ASoC: wm8753: Cleanup manual bias level transitions ASoC: Remove suspend_bias_level from DAPM context struct ASoC: wm8350: Move delayed work struct from DAPM context to driver state ASoC: dapm: Remove delayed_work from dapm context struct ASoC: tegra_alc5632: Use card DAPM context to access widgets ASoC: tegra_rt5677: Use card DAPM context to access widgets ASoC: tegra_wm8903: Use card DAPM context to access widgets ASoC: tegra_wm9712: Use card DAPM context to access widgets ASoC: Create card debugfs directory earlier ASoC: Make soc_dpcm_debugfs_add() non-fatal ASoC: Don't try to register debugfs entries if the parent does not exist ASoC: atmel: Add dependency to SND_SOC_I2C_AND_SPI where necessary ASoC: atmel: Improve machine driver compile test coverage ASoC: wm1133-ev1: Use card DAPM context to access widgets ASoC: mop500_ab8500: Use card DAPM context to access widgets ASoC: davinci-evm: Use card DAPM context to access widgets ASoC: n810: Consistently pass the card DAPM context to n810_ext_control() ASoC: n810: Automatically disconnect non-connected pins Lu, Han (8): ASoC: Intel: add function to load firmware image ASoC: Intel: add function to load sound effect module waves ASoC: Intel: add function to enable/disable sound effect module waves ASoC: Intel: add kcontrol to enable/disable sound effect module waves ASoC: Intel: add function to set parameter to sound effect module waves ASoC: Intel: add kcontrol to set parameter to sound effect module waves Intel: ASoC: Add condition check before set param to waves ASoC: Intel: fix warning reported by static check tool smatch Manish Badarkhe (1): ASoC: davinci-evm: drop un-necessary remove function Mark Brown (38): Merge branch 'fix/rt5677' of git://git.kernel.org/.../broonie/sound into asoc-rt5677 Merge tag 'asoc-fix-v4.0-rc2' into asoc-linus Merge remote-tracking branch 'asoc/topic/dapm-dt' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'asoc/topic/gpiod' and 'asoc/topic/intel' into asoc-next Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'asoc/topic/omap' and 'asoc/topic/rt286' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/simple', 'asoc/topic/tegra' and 'asoc/topic/wm-adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next Merge branch 'topic/notifier' of git://git.kernel.org/.../broonie/regulator into asoc-wm8804 Merge tag 'v4.0-rc3' into asoc-rt5670 Merge tag 'v4.0-rc3' into asoc-intel Merge branch 'fix/intel' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge branch 'topic/rt5670' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge branch 'topic/jack' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge branch 'asoc-fix-rcar' into HEAD Merge branch 'topic/jack' of git://git.kernel.org/.../broonie/sound into asoc-tegra Merge tag 'v4.0-rc7' into asoc-core Merge branch 'topic/delay' of git://git.kernel.org/.../broonie/sound into asoc-core Merge branch 'topic/dapm-dt' of git://git.kernel.org/.../broonie/sound into asoc-core Merge tag 'asoc-fix-v4.0-rc7' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271', 'asoc/fix/davinci' and 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8741' into asoc-linus Merge tag 'asoc-v4.1' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500', 'asoc/topic/ak4642', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into asoc-next Merge remote-tracking branches 'asoc/topic/dmaengine', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/fsl-ssi' into asoc-next Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/kirkwood' into asoc-next Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rt286' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5641', 'asoc/topic/rt5677' and 'asoc/topic/sh-cleanup' into asoc-next Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic/wm8731', 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next Mengdong Lin (1): ASoC: rt5670: add API to select ASRC clock source Nicholas Mc Guire (5): ASoC: wm8996: match wait_for_completion_timeout return type ASoC: wm8996: ensure lower bounds of 1 for timeout ASoC: arizona: match wait_for_completion_timeout return type ASoC: wm5100: match wait_for_completion_timeout return type ASoC: wm2200: match wait_for_completion_timeout return type Nicolas Ferre (1): MAINTAINERS: change the Atmel audio alsa driver entry Nicolin Chen (2): ASoC: core: Add extra dapm properties for Device Tree ASoC: fsl-asoc-card: Add snd_soc_of_parse_audio_routing() Nikesh Oswal (2): ASoC: wm_adsp: Ensure DSP controls are always persistent ASoC: dapm: add code to configure dai link parameters Oder Chiou (3): ASoC: rt5677: Add the chip type to distinguish the setting of the clock source ASoC: rt5677: Keep the LDO2 powered while used in the suspend mode ASoC: rt5677: add API to select ASRC clock source Pascal Huerst (1): ASoC: cs4271: Increase delay time after reset Peter Rosin (3): ASoC: atmel_ssc_dai: Allow more rates ASoC: pcm512x: Rearrange to not repeat dacsrc_rate / dac_div ASoC: pcm512x: Allow independently overclocking PLL, DAC and DSP Peter Ujfalusi (10): ASoC: omap: Kconfig: Support for omap5-uevm analog audio ASoC: davinci-mcasp: Add support for CBS_CFM mode ASoC: davinci: Select SND_EDMA_SOC when SND_DAVINCI_SOC is enabled ASoC: davinci-i2s: Convert to use edma-pcm ASoC: davinci-vcif: Convert to use edma-pcm ASoC: davinci-mcasp: Deprecate the use of davinci-pcm in favor of edma-pcm ASoC: davinci: Remove unused davinci-pcm platform driver ASoC: davinci-mcasp: Allow complete shutdown of McASP when not in use ASoC: davinci-mcasp: Fix compilation error ASoC: davinci-mcasp: Fix ruledata setup in davinci_mcasp_startup Pierre-Louis Bossart (1): ASoC: Intel: remove misleading DMA error messages on Baytrail platforms Sapthagiri Baratam (1): ASoC: wm8804: Add DAPM widgets for SPDIF/AIF Sergej Sawazki (1): ASoC: wm8741: Fix rates constraints values Songjun Wu (1): ASoC: wm8731: let codec to manage clock by itself Subhransu S. Prusty (3): ASoC: Intel: Add memcpy32_fromio as well ASoC: Intel: Remove ignore suspend support ASoC: Intel: Remove soc pm handling to allow platform driver handle it Sudip Mukherjee (1): ASoC: Intel: remove unused functions Takeshi Kihara (1): ASoC: ak4642: enable stereo line output power-save mode Tomeu Vizoso (3): ASoC: tegra: Expose Headphones pin to userspace ASoC: tegra: Add sink for the internal mic to tegra_max98090 ASoC: tegra: Add control for the Mic Jack pin Uwe Kleine-König (5): ASoC: improve usage of gpiod API ASoC: fsi: fix license specification ASoC: fsi: reorder code to make a forward declaration superfluous ASoC: fsi: mark several data structures as const ASoC: rcar: mark device data as constant Vinod Koul (10): ASoC: core: allow pcms to be registered as nonatomic ASoC: Intel: mark cht machine driver with nonatomic trigger ASoC: Intel: update MMX ID to 3 ASoC: Intel: add support for pause and resume in sst ASoC: Intel: add support for pcm stream suspend/resume ASoC: Intel: add support for platform suspend ASoC: Intel: add pm support in sst ipc driver ASoC: Intel: Move the fw download to power_control ASoC: Intel: wrap runtime_pm usage count under CONFIG_PM ASoC: Intel: acpi_probe: fix error return path Vishal Thanki (1): ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of Zubair Lutfullah Kakakhel (1): ASoC: jz4740: Add jz4780 support kbuild test robot (4): ASoC: tegra: fix platform_no_drv_owner.cocci warnings ASoC: max98925_spk_tlv can be static ASoC: Intel: read_shim_data() can be static ASoC: Intel: fix array_size.cocci warnings .../bindings/sound/ingenic,jz4740-i2s.txt | 2 +- .../devicetree/bindings/sound/max98925.txt | 22 + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 43 + .../devicetree/bindings/sound/renesas,rsnd.txt | 125 ++- .../bindings/sound/renesas,rsrc-card.txt | 67 ++ Documentation/devicetree/bindings/sound/storm.txt | 23 + Documentation/devicetree/bindings/sound/wm8804.txt | 7 + Documentation/sound/alsa/ControlNames.txt | 10 +- MAINTAINERS | 9 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +- drivers/dma/of-dma.c | 1 + drivers/regulator/devres.c | 85 ++ include/linux/regulator/consumer.h | 16 + include/sound/pcm_params.h | 7 + include/sound/rt5670.h | 1 + include/sound/simple_card.h | 1 - include/sound/soc-dapm.h | 6 +- include/sound/soc-dpcm.h | 2 +- include/sound/soc.h | 30 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/Kconfig | 9 +- sound/soc/atmel/Makefile | 2 - sound/soc/atmel/atmel-pcm-dma.c | 4 +- sound/soc/atmel/atmel-pcm-pdc.c | 79 ++ sound/soc/atmel/atmel-pcm.c | 121 --- sound/soc/atmel/atmel-pcm.h | 5 - sound/soc/atmel/atmel_ssc_dai.c | 111 ++- sound/soc/atmel/atmel_ssc_dai.h | 1 + sound/soc/codecs/Kconfig | 22 +- sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ab8500-codec.c | 2 - sound/soc/codecs/adau1977.c | 17 +- sound/soc/codecs/ak4554.c | 2 +- sound/soc/codecs/ak4642.c | 41 +- sound/soc/codecs/arizona.c | 6 +- sound/soc/codecs/cs35l32.c | 19 +- sound/soc/codecs/cs4265.c | 19 +- sound/soc/codecs/cs4271.c | 4 +- sound/soc/codecs/cx20442.c | 4 +- sound/soc/codecs/max98090.c | 17 + sound/soc/codecs/max98357a.c | 11 +- sound/soc/codecs/max98925.c | 655 ++++++++++++++++ sound/soc/codecs/max98925.h | 832 ++++++++++++++++++++ sound/soc/codecs/pcm512x.c | 205 ++++- sound/soc/codecs/rt286.c | 40 +- sound/soc/codecs/rt5631.c | 2 +- sound/soc/codecs/rt5645.c | 90 ++- sound/soc/codecs/rt5645.h | 2 - sound/soc/codecs/rt5670.c | 213 ++++- sound/soc/codecs/rt5670.h | 10 + sound/soc/codecs/rt5677.c | 207 ++++- sound/soc/codecs/rt5677.h | 85 ++ sound/soc/codecs/sn95031.c | 14 +- sound/soc/codecs/sn95031.h | 3 +- sound/soc/codecs/sta350.c | 30 +- sound/soc/codecs/tas2552.c | 13 +- sound/soc/codecs/tlv320aic23-i2c.c | 4 +- sound/soc/codecs/wm2200.c | 9 +- sound/soc/codecs/wm5100.c | 7 +- sound/soc/codecs/wm5102.c | 1 - sound/soc/codecs/wm8350.c | 25 +- sound/soc/codecs/wm8731.c | 34 + sound/soc/codecs/wm8741.c | 8 +- sound/soc/codecs/wm8753.c | 73 +- sound/soc/codecs/wm8804-i2c.c | 65 ++ sound/soc/codecs/wm8804-spi.c | 57 ++ sound/soc/codecs/wm8804.c | 534 ++++++------- sound/soc/codecs/wm8804.h | 8 + sound/soc/codecs/wm8971.c | 99 +-- sound/soc/codecs/wm8996.c | 12 +- sound/soc/codecs/wm_adsp.c | 13 +- sound/soc/davinci/Kconfig | 18 +- sound/soc/davinci/Makefile | 2 - sound/soc/davinci/davinci-evm.c | 17 +- sound/soc/davinci/davinci-i2s.c | 67 +- sound/soc/davinci/davinci-mcasp.c | 335 +++++--- sound/soc/davinci/davinci-pcm.c | 861 --------------------- sound/soc/davinci/davinci-pcm.h | 41 - sound/soc/davinci/davinci-vcif.c | 55 +- sound/soc/fsl/Kconfig | 4 +- sound/soc/fsl/fsl-asoc-card.c | 6 + sound/soc/fsl/fsl_ssi.c | 32 +- sound/soc/fsl/imx-es8328.c | 6 +- sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/pcm030-audio-fabric.c | 2 +- sound/soc/fsl/wm1133-ev1.c | 15 +- sound/soc/generic/simple-card.c | 50 +- sound/soc/intel/Makefile | 42 +- sound/soc/intel/atom/Makefile | 7 + sound/soc/intel/{ => atom}/sst-atom-controls.c | 0 sound/soc/intel/{ => atom}/sst-atom-controls.h | 0 sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0 .../intel/{ => atom}/sst-mfld-platform-compress.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 60 ++ sound/soc/intel/{ => atom}/sst-mfld-platform.h | 1 + sound/soc/intel/{ => atom}/sst/Makefile | 0 sound/soc/intel/{ => atom}/sst/sst.c | 130 +++- sound/soc/intel/{ => atom}/sst/sst.h | 12 + sound/soc/intel/{ => atom}/sst/sst_acpi.c | 4 +- sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 69 +- sound/soc/intel/{ => atom}/sst/sst_ipc.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_loader.c | 12 +- sound/soc/intel/{ => atom}/sst/sst_pci.c | 0 sound/soc/intel/{ => atom}/sst/sst_pvt.c | 26 +- sound/soc/intel/{ => atom}/sst/sst_stream.c | 2 +- sound/soc/intel/baytrail/Makefile | 4 + sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 +- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 364 ++------- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0 sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 +- sound/soc/intel/boards/Makefile | 15 + sound/soc/intel/{ => boards}/broadwell.c | 50 +- sound/soc/intel/{ => boards}/byt-max98090.c | 13 +- sound/soc/intel/{ => boards}/byt-rt5640.c | 4 +- .../{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 8 +- sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 20 +- sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 108 ++- sound/soc/intel/{ => boards}/haswell.c | 10 +- sound/soc/intel/{ => boards}/mfld_machine.c | 24 +- sound/soc/intel/common/Makefile | 7 + sound/soc/intel/{ => common}/sst-acpi.c | 1 + sound/soc/intel/{ => common}/sst-dsp-priv.h | 13 + sound/soc/intel/{ => common}/sst-dsp.c | 0 sound/soc/intel/{ => common}/sst-dsp.h | 2 +- sound/soc/intel/{ => common}/sst-firmware.c | 10 +- sound/soc/intel/common/sst-ipc.c | 294 +++++++ sound/soc/intel/common/sst-ipc.h | 91 +++ sound/soc/intel/haswell/Makefile | 4 + sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 9 +- sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 794 ++++++++++++------- sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 53 ++ sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 140 +++- sound/soc/jz4740/jz4740-i2s.c | 84 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/nuc900/nuc900-audio.h | 3 - sound/soc/nuc900/nuc900-pcm.c | 31 +- sound/soc/omap/Kconfig | 4 +- sound/soc/omap/ams-delta.c | 4 +- sound/soc/omap/n810.c | 23 +- sound/soc/omap/omap-abe-twl6040.c | 10 +- sound/soc/omap/omap-hdmi-audio.c | 2 - sound/soc/omap/omap-pcm.c | 21 +- sound/soc/omap/omap-twl4030.c | 12 +- sound/soc/omap/rx51.c | 6 +- sound/soc/pxa/hx4700.c | 11 +- sound/soc/pxa/palm27x.c | 11 +- sound/soc/pxa/ttc-dkb.c | 15 +- sound/soc/pxa/z2.c | 10 +- sound/soc/qcom/Kconfig | 25 + sound/soc/qcom/Makefile | 11 + sound/soc/qcom/lpass-cpu.c | 491 ++++++++++++ sound/soc/qcom/lpass-lpaif-ipq806x.h | 172 ++++ sound/soc/qcom/lpass-platform.c | 526 +++++++++++++ sound/soc/qcom/lpass.h | 51 ++ sound/soc/qcom/storm.c | 162 ++++ sound/soc/samsung/h1940_uda1380.c | 9 +- sound/soc/samsung/littlemill.c | 12 +- sound/soc/samsung/lowland.c | 14 +- sound/soc/samsung/rx1950_uda1380.c | 9 +- sound/soc/samsung/smartq_wm8987.c | 11 +- sound/soc/samsung/speyside.c | 14 +- sound/soc/samsung/tobermory.c | 13 +- sound/soc/sh/Kconfig | 6 + sound/soc/sh/fsi.c | 71 +- sound/soc/sh/rcar/Makefile | 7 +- sound/soc/sh/rcar/adg.c | 4 +- sound/soc/sh/rcar/core.c | 278 ++----- sound/soc/sh/rcar/dma.c | 616 +++++++++++++++ sound/soc/sh/rcar/dvc.c | 45 +- sound/soc/sh/rcar/gen.c | 152 +--- sound/soc/sh/rcar/rsnd.h | 92 ++- sound/soc/sh/rcar/rsrc-card.c | 512 ++++++++++++ sound/soc/sh/rcar/src.c | 250 ++++-- sound/soc/sh/rcar/ssi.c | 73 +- sound/soc/soc-core.c | 124 +-- sound/soc/soc-dapm.c | 182 ++++- sound/soc/soc-jack.c | 42 +- sound/soc/soc-pcm.c | 17 +- sound/soc/tegra/tegra_alc5632.c | 14 +- sound/soc/tegra/tegra_max98090.c | 26 +- sound/soc/tegra/tegra_rt5640.c | 10 +- sound/soc/tegra/tegra_rt5677.c | 20 +- sound/soc/tegra/tegra_wm8903.c | 21 +- sound/soc/tegra/tegra_wm9712.c | 6 +- sound/soc/ux500/mop500_ab8500.c | 36 +- 188 files changed, 8983 insertions(+), 3633 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/max98925.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt create mode 100644 Documentation/devicetree/bindings/sound/storm.txt delete mode 100644 sound/soc/atmel/atmel-pcm.c create mode 100644 sound/soc/codecs/max98925.c create mode 100644 sound/soc/codecs/max98925.h create mode 100644 sound/soc/codecs/wm8804-i2c.c create mode 100644 sound/soc/codecs/wm8804-spi.c delete mode 100644 sound/soc/davinci/davinci-pcm.c delete mode 100644 sound/soc/davinci/davinci-pcm.h create mode 100644 sound/soc/intel/atom/Makefile rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%) rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (94%) rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (99%) rename sound/soc/intel/{ => atom}/sst/Makefile (100%) rename sound/soc/intel/{ => atom}/sst/sst.c (79%) rename sound/soc/intel/{ => atom}/sst/sst.h (98%) rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (92%) rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_loader.c (97%) rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (95%) rename sound/soc/intel/{ => atom}/sst/sst_stream.c (99%) create mode 100644 sound/soc/intel/baytrail/Makefile rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (71%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%) create mode 100644 sound/soc/intel/boards/Makefile rename sound/soc/intel/{ => boards}/broadwell.c (86%) rename sound/soc/intel/{ => boards}/byt-max98090.c (94%) rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%) rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (97%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (95%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (75%) rename sound/soc/intel/{ => boards}/haswell.c (96%) rename sound/soc/intel/{ => boards}/mfld_machine.c (96%) create mode 100644 sound/soc/intel/common/Makefile rename sound/soc/intel/{ => common}/sst-acpi.c (99%) rename sound/soc/intel/{ => common}/sst-dsp-priv.h (97%) rename sound/soc/intel/{ => common}/sst-dsp.c (100%) rename sound/soc/intel/{ => common}/sst-dsp.h (99%) rename sound/soc/intel/{ => common}/sst-firmware.c (99%) create mode 100644 sound/soc/intel/common/sst-ipc.c create mode 100644 sound/soc/intel/common/sst-ipc.h create mode 100644 sound/soc/intel/haswell/Makefile rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (98%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (77%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (87%) rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (88%) create mode 100644 sound/soc/qcom/Kconfig create mode 100644 sound/soc/qcom/Makefile create mode 100644 sound/soc/qcom/lpass-cpu.c create mode 100644 sound/soc/qcom/lpass-lpaif-ipq806x.h create mode 100644 sound/soc/qcom/lpass-platform.c create mode 100644 sound/soc/qcom/lpass.h create mode 100644 sound/soc/qcom/storm.c create mode 100644 sound/soc/sh/rcar/dma.c create mode 100644 sound/soc/sh/rcar/rsrc-card.c

2 2

Re: [alsa-devel] ASoC: davinci-mcasp: Set rule constraints if implicit BCLK divider is used
by Dan Carpenter 13 Apr '15

13 Apr '15

Hello Jyri Sarha, The patch a75a053f1eef: "ASoC: davinci-mcasp: Set rule constraints if implicit BCLK divider is used" from Mar 20, 2015, leads to the following Sparse warning: sound/soc/davinci/davinci-mcasp.c:1098:45: warning: Variable length array is used. sound/soc/davinci/davinci-mcasp.c 1088 static int davinci_mcasp_hw_rule_channels(struct snd_pcm_hw_params *params, 1089 struct snd_pcm_hw_rule *rule) 1090 { 1091 struct davinci_mcasp_ruledata *rd = rule->private; 1092 struct snd_interval *ci = 1093 hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); 1094 int sbits = params_width(params); 1095 int rate = params_rate(params); 1096 int max_chan_per_wire = rd->mcasp->tdm_slots < ci->max ? 1097 rd->mcasp->tdm_slots : ci->max; 1098 unsigned int list[ci->max - ci->min + 1]; ^^^^^^^^^^^^^^^^^^^^^ I wasnt able to determine where these values are capped. The worry is that the kernel only has an 8k stack so if they are too high it could oops. I think these values can come from the user in snd_pcm_hw_params_user() but I'm an newbie to the code and I didn't see where the limits were enforced. 1099 int c1, c, count = 0; 1100 1101 for (c1 = ci->min; c1 <= max_chan_per_wire; c1++) { 1102 uint bclk_freq = c1*sbits*rate; 1103 int ppm; regards, dan carpenter

3 5

[alsa-devel] [PATCH] ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T450
by Jo-Philipp Wich 13 Apr '15

13 Apr '15

The Lenovo Thinkpad T450 requires the ALC292_FIXUP_TPT440_DOCK as well in order to get working sound output on the docking stations headphone jack. Patch tested on a Thinkpad T450 (20BVCTO1WW) using kernel 4.0-rc7 in conjunction with a ThinkPad Ultradock. Signed-off-by: Jo-Philipp Wich <jow(a)openwrt.org> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f9d12c0..52aa8ae 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5053,6 +5053,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x17aa, 0x5034, "Thinkpad T450", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), -- 1.7.10.4

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda - Expose codec type sysfs
by Takashi Iwai 13 Apr '15

13 Apr '15

The type field of HD-audio codec object should be exposed to user-space so that it can identify which driver type to bind (legacy / asoc). Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/hda/hdac_sysfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index 18aea43d230d..0a6ce3b84cc4 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -36,6 +36,7 @@ static ssize_t type##_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(type) +CODEC_ATTR(type); CODEC_ATTR(vendor_id); CODEC_ATTR(subsystem_id); CODEC_ATTR(revision_id); @@ -45,6 +46,7 @@ CODEC_ATTR_STR(vendor_name); CODEC_ATTR_STR(chip_name); static struct attribute *hdac_dev_attrs[] = { + &dev_attr_type.attr, &dev_attr_vendor_id.attr, &dev_attr_subsystem_id.attr, &dev_attr_revision_id.attr, -- 2.3.5

1 1

[alsa-devel] [PATCH] ASoC: Intel: fix ifnullfree.cocci warnings
by kbuild test robot 13 Apr '15

13 Apr '15

sound/soc/intel/common/sst-ipc.c:287:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values. NULL check before some freeing functions is not needed. Based on checkpatch warning "kfree(NULL) is safe this check is probably not required" and kfreeaddr.cocci by Julia Lawall. Generated by: scripts/coccinelle/free/ifnullfree.cocci CC: Jin Yao <yao.jin(a)linux.intel.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- sst-ipc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/soc/intel/common/sst-ipc.c +++ b/sound/soc/intel/common/sst-ipc.c @@ -283,8 +283,7 @@ void sst_ipc_fini(struct sst_generic_ipc if (ipc->tx_thread) kthread_stop(ipc->tx_thread); - if (ipc->msg) - kfree(ipc->msg); + kfree(ipc->msg); } EXPORT_SYMBOL_GPL(sst_ipc_fini);

3 2

Re: [alsa-devel] [Intel-gfx] [PATCH 15/19] drm/i915: HSW cdclk support
by Ville Syrjälä 13 Apr '15

13 Apr '15

On Mon, Apr 13, 2015 at 12:43:14PM +0300, Mika Kahola wrote: > On Fri, 2015-04-10 at 16:10 +0200, Takashi Iwai wrote: > > At Fri, 10 Apr 2015 16:27:39 +0300, > > Mika Kahola wrote: > > > > > > On Thu, 2015-04-09 at 17:17 +0200, Takashi Iwai wrote: > > > > At Thu, 9 Apr 2015 15:51:27 +0200, > > > > Daniel Vetter wrote: > > > > > > > > > > On Thu, Apr 09, 2015 at 04:41:26PM +0300, Mika Kahola wrote: > > > > > > On Thu, 2015-04-09 at 11:32 +0200, Daniel Vetter wrote: > > > > > > > On Thu, Apr 09, 2015 at 10:24:24AM +0300, Mika Kahola wrote: > > > > > > > > I did some testing on audio part with HDMI-HDMI and DP-HDMI cables > > > > > > > > connected to my Haswell box. Before applying the patch I tested as a > > > > > > > > reference with the latest -nightly (04-08-2015), 4.0-rc7. Unfortunately, > > > > > > > > I failed to get any audio over HDMI cable. For a reference I tested with > > > > > > > > the very same setup the vanillla kernel from Linus tree 4.0-rc7 and with > > > > > > > > that kernel the audio worked ok. Then I did some GIT bisecting and it > > > > > > > > turned out that the first commit that I failed to get audio working was > > > > > > > > aa2fee4286e43b4784982b17669b02cc99c1ae55. > > > > > > > > > > > > > I rerun the bisecting and this time the result was > > > > > > > > > > > > commit 0a599838737a2527c35e4d94f794aefe59df1781 > > > > > > Merge: 2d846c7 a59d719 > > > > > > Author: Takashi Iwai <tiwai(a)suse.de> > > > > > > Date: Wed Apr 8 11:29:56 2015 +0200 > > > > > > > > > > > > Merge branch 'for-linus' into for-next > > > > > > > > > > > > Back merge HD-audio quirks to for-next branch, so that we can apply > > > > > > a couple of more quirks. > > > > > > > > > > > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > > > > > > > > > > Adding Takashi and intel audio folks. > > > > > > > > The bisecting looks odd. The commit you pointed is a back-merge from > > > > 4.0-rc to next branch, so this merge itself shouldn't bring so many > > > > stuff -- at least about the sound part. > > > > > > > > The diff in sound/* is found below. As you can see, the only change > > > > relevant with HDMI is the chunk in sound/pci/hda/hda_intel.c for > > > > HD-audio controller, but it's specific to Skylake, thus this must be > > > > irrelevant with your hardware. > > > > > > > > Please double-check. > > > > > > I double-checked the bisecting and I ended up with the same result. You're > > > right, it does seems odd why audio on my Haswell box stopped working. > > > > > > Any ideas how to proceed from here? > > > > Try to check whether the reverting the diff of sound/* manually fixes > > the problem. (i.e. apply diff -R for the diff I showed in the > > previous mail.) > > > > If it doesn't fix but still reverting the whole commit does fix, it > > means that something else got broken by the merge. > > > > > > Takashi > > > > I reverted the diff but unfortunately there were no difference. > > For curiosity, I tested the audio with the latest -nightly and I got > the audio working again. I wonder what has changed but it seems that > the problem is now solved. BTW we now have a WARN triggering on BSW due to hda trying to query the current cdclk frequency. https://bugs.freedesktop.org/show_bug.cgi?id=90012 I'm not sure if hda really needs to know the cdclk freq on BSW or not. But in either case I think we should just kill the HAS_DDI check. Once these patches land the code will anyway work on all platforms. Mika, can you add that to your list of things to do on top of these patches? > > -Mika- > > > > > > > > > Cheers, > > > Mika > > > > > > > > > > thanks, > > > > > > > > Takashi > > > > > > > > === > > > > % git diff 0a599838737a2527c35e4d94f794aefe59df1781^..0a599838737a2527c35e4d94f794aefe59df1781 sound > > > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > > > > index 9bcc5457a83e..e1c210515581 100644 > > > > --- a/sound/pci/hda/hda_intel.c > > > > +++ b/sound/pci/hda/hda_intel.c > > > > @@ -1967,7 +1967,7 @@ static const struct pci_device_id azx_ids[] = { > > > > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, > > > > /* Sunrise Point */ > > > > { PCI_DEVICE(0x8086, 0xa170), > > > > - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, > > > > + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, > > > > /* Sunrise Point-LP */ > > > > { PCI_DEVICE(0x8086, 0x9d70), > > > > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, > > > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > > > > index e0c06f9a0e80..7f46d063af57 100644 > > > > --- a/sound/pci/hda/patch_realtek.c > > > > +++ b/sound/pci/hda/patch_realtek.c > > > > @@ -396,7 +396,7 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on) > > > > { > > > > /* We currently only handle front, HP */ > > > > static hda_nid_t pins[] = { > > > > - 0x0f, 0x10, 0x14, 0x15, 0 > > > > + 0x0f, 0x10, 0x14, 0x15, 0x17, 0 > > > > }; > > > > hda_nid_t *p; > > > > for (p = pins; *p; p++) > > > > @@ -2870,6 +2870,8 @@ static void alc283_init(struct hda_codec *codec) > > > > > > > > if (!hp_pin) > > > > return; > > > > + > > > > + msleep(30); > > > > hp_pin_sense = snd_hda_jack_detect(codec, hp_pin); > > > > > > > > /* Index 0x43 Direct Drive HP AMP LPM Control 1 */ > > > > @@ -3564,6 +3566,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_process_coef_fw(codec, coef0255); > > > > break; > > > > case 0x10ec0233: > > > > @@ -3619,6 +3622,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_write_coef_idx(codec, 0x45, 0xc489); > > > > snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); > > > > alc_process_coef_fw(codec, coef0255); > > > > @@ -3688,6 +3692,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_process_coef_fw(codec, coef0255); > > > > break; > > > > case 0x10ec0233: > > > > @@ -3742,6 +3747,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_process_coef_fw(codec, coef0255); > > > > break; > > > > case 0x10ec0233: > > > > @@ -3796,6 +3802,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_process_coef_fw(codec, coef0255); > > > > break; > > > > case 0x10ec0233: > > > > @@ -3841,6 +3848,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) > > > > > > > > switch (codec->core.vendor_id) { > > > > case 0x10ec0255: > > > > + case 0x10ec0256: > > > > alc_process_coef_fw(codec, coef0255); > > > > msleep(300); > > > > val = alc_read_coef_idx(codec, 0x46); > > > > @@ -4993,6 +5001,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > > > > SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC), > > > > SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK), > > > > SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), > > > > + SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK), > > > > SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), > > > > SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), > > > > SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), > > > > @@ -5173,6 +5182,16 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { > > > > {0x17, 0x40000000}, > > > > {0x1d, 0x40700001}, > > > > {0x21, 0x02211050}), > > > > + SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, > > > > + {0x12, 0x90a60140}, > > > > + {0x13, 0x40000000}, > > > > + {0x14, 0x90170110}, > > > > + {0x19, 0x411111f0}, > > > > + {0x1a, 0x411111f0}, > > > > + {0x1b, 0x411111f0}, > > > > + {0x1d, 0x40700001}, > > > > + {0x1e, 0x411111f0}, > > > > + {0x21, 0x02211020}), > > > > SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, > > > > {0x12, 0x90a60130}, > > > > {0x13, 0x40000000}, > > > > diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c > > > > index 353532b8aee4..8f63e8c8b46c 100644 > > > > --- a/sound/usb/quirks.c > > > > +++ b/sound/usb/quirks.c > > > > @@ -1113,8 +1113,13 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, > > > > > > > > bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) > > > > { > > > > - /* MS Lifecam HD-5000 doesn't support reading the sample rate. */ > > > > - return chip->usb_id == USB_ID(0x045E, 0x076D); > > > > + /* devices which do not support reading the sample rate. */ > > > > + switch (chip->usb_id) { > > > > + case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ > > > > + case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ > > > > + return true; > > > > + } > > > > + return false; > > > > } > > > > > > > > /* Marantz/Denon USB DACs need a vendor cmd to switch > > > > > > > > > > > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC

1 0

[alsa-devel] [PATCH] ctl: fix to handle several elements added by one operation for userspace element
by Takashi Sakamoto 13 Apr '15

13 Apr '15

An element instance can have several elements with the same feature. Some userspace applications can add such an element instance by add operation with the number of elements. Then, the element instance gets a memory object to keep states of these elements. But the element instance has just one memory object for the elements. This causes the same result to each read/write operations to the different elements. This commit fixes this bug by allocating enough memory objects to the element instance for each of elements. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index ccb1ca2..5b2c352 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1029,7 +1029,7 @@ static int snd_ctl_elem_unlock(struct snd_ctl_file *file, struct user_element { struct snd_ctl_elem_info info; struct snd_card *card; - void *elem_data; /* element data */ + char *elem_data; /* element data */ unsigned long elem_data_size; /* size of element data in bytes */ void *tlv_data; /* TLV data */ unsigned long tlv_data_size; /* TLV data size */ @@ -1078,9 +1078,12 @@ static int snd_ctl_elem_user_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct user_element *ue = kcontrol->private_data; + unsigned int size = ue->elem_data_size; + char *src = ue->elem_data + + snd_ctl_get_ioff(kcontrol, &ucontrol->id) * size; mutex_lock(&ue->card->user_ctl_lock); - memcpy(&ucontrol->value, ue->elem_data, ue->elem_data_size); + memcpy(&ucontrol->value, src, size); mutex_unlock(&ue->card->user_ctl_lock); return 0; } @@ -1090,11 +1093,14 @@ static int snd_ctl_elem_user_put(struct snd_kcontrol *kcontrol, { int change; struct user_element *ue = kcontrol->private_data; + unsigned int size = ue->elem_data_size; + char *dst = ue->elem_data + + snd_ctl_get_ioff(kcontrol, &ucontrol->id) * size; mutex_lock(&ue->card->user_ctl_lock); - change = memcmp(&ucontrol->value, ue->elem_data, ue->elem_data_size) != 0; + change = memcmp(&ucontrol->value, dst, size) != 0; if (change) - memcpy(ue->elem_data, &ucontrol->value, ue->elem_data_size); + memcpy(dst, &ucontrol->value, size); mutex_unlock(&ue->card->user_ctl_lock); return change; } @@ -1278,7 +1284,7 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, if (err < 0) return err; memcpy(&kctl->id, &info->id, sizeof(kctl->id)); - kctl->private_data = kzalloc(sizeof(struct user_element) + private_size, + kctl->private_data = kzalloc(sizeof(struct user_element) + private_size * count, GFP_KERNEL); if (kctl->private_data == NULL) { kfree(kctl); -- 2.1.0

2 3

[alsa-devel] [PATCH] ASoC: Intel: fix array_size.cocci warnings
by kbuild test robot 12 Apr '15

12 Apr '15

sound/soc/intel/haswell/sst-haswell-ipc.c:646:28-29: WARNING: Use ARRAY_SIZE Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element Semantic patch information: This makes an effort to find cases where ARRAY_SIZE can be used such as where there is a division of sizeof the array by the sizeof its first element or by any indexed element or the element type. It replaces the division of the two sizeofs by ARRAY_SIZE. Generated by: scripts/coccinelle/misc/array_size.cocci CC: Jie Yang <yang.jie(a)intel.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- sst-haswell-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -643,7 +643,7 @@ static void hsw_fw_ready(struct sst_hsw /* log the FW version info got from the mailbox here. */ memcpy(fw_info, fw_ready.fw_info, fw_ready.fw_info_size); pinfo = &fw_info[0]; - for (i = 0; i < sizeof(tmp) / sizeof(char *); i++) + for (i = 0; i < ARRAY_SIZE(tmp); i++) tmp[i] = strsep(&pinfo, " "); dev_info(hsw->dev, "FW loaded, mailbox readback FW info: type %s, - " "version: %s.%s, build %s, source commit id: %s\n",

2 1

Re: [alsa-devel] Issues and/or possible bugs in alsa
by Yomi Ogunwumi 12 Apr '15

12 Apr '15

I don't think I've disabled anything. • Yomi On Apr 12, 2015 12:31 PM, "Raymond Yau" <superquad.vortex2(a)gmail.com> wrote: > > > > I'm not sure if it worked with pervious kernel versions. There was a > time I rolled back earlier kernel versions — The result was the same, it > didn't work. > > > > It might have worked with Windows 8, but I had installed Arch soon after > obtaining the laptop. > > >Second. When I plug in these headphones, I can't use the internal > microphone on this laptop, it mutes. (AFAICT) These headphones do not have > a microphone built in, they're just an ordinary pair of headphones. > However, I was given a workaround in #alsa on freenode. In order to use the > laptop's internal microphone with my headphones plugged in, I have to do : > sudo hda-verb /dev/snd/hwC1D0 0x22 SET_CONNECT_SEL 6 — it works, but it > isn't really ideal. > > 0x22 [Audio Selector] wcaps 0x30010b: Stereo Amp-In > Amp-In caps: N/A > Amp-In vals: [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 0x00] [0x00 > 0x00] [0x00 0x00] [0x00 0x00] > Connection: 7 > 0x18 0x19 0x1a 0x1b 0x1d 0x0b 0x12* > > Do you mean disable jack detection cannot work around this jack detection > fault ? > > Using hda-emu, the driver seem select internal mic when jack detection is > disabled on startup > > >> > >> How about disable jack detect using hint jack_detect=0 ? > >> > >> > https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/tree/Documenta… > >> > >> you have to select mic jack using capture source and manually mute the > speaket >

1 0

[alsa-devel] [PATCH 1/2] ASoC: n810: Consistently pass the card DAPM context to n810_ext_control()
by Lars-Peter Clausen 12 Apr '15

12 Apr '15

Some callers of n810_ext_control() pass the card DAPM context and some pass the CODEC DAPM context. Given that some of the widgets that are accessed in the function are in the card's context, always passing it is the obvious choice. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/omap/n810.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 5d7f9ce..617eae3 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -98,12 +98,11 @@ static int n810_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->codec; snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2); - n810_ext_control(&codec->dapm); + n810_ext_control(&rtd->card->dapm); return clk_prepare_enable(sys_clkout2); } -- 1.8.0

3 3

[alsa-devel] [PATCH] ASoC: davinci-evm: Use card DAPM context to access widgets
by Lars-Peter Clausen 12 Apr '15

12 Apr '15

The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/davinci/davinci-evm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 8c2b9be..731fb0d 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -117,7 +117,6 @@ static const struct snd_soc_dapm_route audio_map[] = { static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; - struct snd_soc_codec *codec = rtd->codec; struct device_node *np = card->dev->of_node; int ret; @@ -136,9 +135,9 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) } /* not connected */ - snd_soc_dapm_nc_pin(&codec->dapm, "MONO_LOUT"); - snd_soc_dapm_nc_pin(&codec->dapm, "HPLCOM"); - snd_soc_dapm_nc_pin(&codec->dapm, "HPRCOM"); + snd_soc_dapm_nc_pin(&card->dapm, "MONO_LOUT"); + snd_soc_dapm_nc_pin(&card->dapm, "HPLCOM"); + snd_soc_dapm_nc_pin(&card->dapm, "HPRCOM"); return 0; } -- 1.8.0

2 1

[alsa-devel] [PATCH] ASoC: mop500_ab8500: Use card DAPM context to access widgets
by Lars-Peter Clausen 12 Apr '15

12 Apr '15

The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/ux500/mop500_ab8500.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index aa65370..b81a7a4c 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -362,7 +362,7 @@ struct snd_soc_ops mop500_ab8500_ops[] = { int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_dapm_context *dapm = &rtd->card->dapm; struct device *dev = rtd->card->dev; struct mop500_ab8500_drvdata *drvdata; int ret; @@ -407,23 +407,23 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd) return ret; } - ret = snd_soc_dapm_disable_pin(&codec->dapm, "Earpiece"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Left"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Right"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Left"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Right"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 1"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 2"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 1"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 2"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Left"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Right"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 1"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 2"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 3"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 4"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 5"); - ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 6"); + ret = snd_soc_dapm_disable_pin(dapm, "Earpiece"); + ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Left"); + ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Right"); + ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Left"); + ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Right"); + ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 1"); + ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 2"); + ret |= snd_soc_dapm_disable_pin(dapm, "Mic 1"); + ret |= snd_soc_dapm_disable_pin(dapm, "Mic 2"); + ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Left"); + ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Right"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 1"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 2"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 3"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 4"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 5"); + ret |= snd_soc_dapm_disable_pin(dapm, "DMic 6"); return ret; } -- 1.8.0

2 1

[alsa-devel] [PATCH] ASoC: wm1133-ev1: Use card DAPM context to access widgets
by Lars-Peter Clausen 12 Apr '15

12 Apr '15

The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/fsl/wm1133-ev1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c index 0653aa8..b454972 100644 --- a/sound/soc/fsl/wm1133-ev1.c +++ b/sound/soc/fsl/wm1133-ev1.c @@ -202,7 +202,6 @@ static struct snd_soc_jack_pin mic_jack_pins[] = { static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; /* Headphone jack detection */ snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE, @@ -216,7 +215,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, SND_JACK_BTN_0); - snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); + snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias"); return 0; } -- 1.8.0

2 1

[alsa-devel] [PATCH 1/2] ASoC: atmel: Add dependency to SND_SOC_I2C_AND_SPI where necessary
by Lars-Peter Clausen 12 Apr '15

12 Apr '15

The SND_AT91_SOC_SAM9G20_WM8731 and SND_AT91_SOC_SAM9X5_WM8731 machine driver symbols select SND_SOC_WM8731 which depends on SND_SOC_I2C_AND_SPI. So the machine driver symbols need to depend on SND_SOC_I2C_AND_SPI as well, otherwise we might end up with a invalid configuration, which will sooner or later upset the randconfig auto-builders. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/atmel/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 1579e99..2f185e5 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -25,7 +25,7 @@ config SND_ATMEL_SOC_SSC config SND_AT91_SOC_SAM9G20_WM8731 tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" - depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC + depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_SSC select SND_SOC_WM8731 @@ -45,7 +45,7 @@ config SND_ATMEL_SOC_WM8904 config SND_AT91_SOC_SAM9X5_WM8731 tristate "SoC Audio support for WM8731-based at91sam9x5 board" - depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC + depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI select SND_ATMEL_SOC_SSC select SND_ATMEL_SOC_DMA select SND_SOC_WM8731 -- 1.8.0

2 2

[alsa-devel] [PATCH] ASoC: Intel: remove unneeded variable
by Julia Lawall 12 Apr '15

12 Apr '15

Removes unneeded variable used to store return value. Generated by: scripts/coccinelle/misc/returnvar.cocci CC: Jie Yang <yang.jie(a)intel.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Julia Lawall <julia.lawall(a)lip6.fr> --- sst-baytrail-ipc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/sound/soc/intel/baytrail/sst-baytrail-ipc.c +++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c @@ -511,7 +511,6 @@ static int sst_byt_process_notification( struct sst_byt_stream *stream; u64 header; u8 msg_id, stream_id; - int handled = 1; header = sst_dsp_shim_read64_unlocked(sst, SST_IPCD); msg_id = sst_byt_header_msg_id(header); @@ -531,7 +530,7 @@ static int sst_byt_process_notification( break; } - return handled; + return 1; } static irqreturn_t sst_byt_irq_thread(int irq, void *context)

2 1

[alsa-devel] [PATCH 0/2 RFC] control core refactoring
by Takashi Sakamoto 12 Apr '15

12 Apr '15

This patchset is for refactoring control core code. The first patch is re-send http://mailman.alsa-project.org/pipermail/alsa-devel/2015-February/087700.h… The second patch is new. As long as I investigated, the changed code was written in 1999 and its basic design have never been changed. In my opinion, the design is a bit complicated and refactoring it is better to decrease maintaining cost. Takashi Sakamoto (2): ALSA: ctl: evaluate macro instead of numerical value ALSA: ctl: refactoring for read operation sound/core/control.c | 87 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 33 deletions(-) -- 2.1.0

2 14

Re: [alsa-devel] Playback - Overwrite buffer with silence
by Nilhcraiv 12 Apr '15

12 Apr '15

Hello Clemens, Fisrt of all thanks for your answer. In my code there are error checking, of course. The code of this email thread is only just to simplify the question. Clemens wrote: It is impossible for the boundar to be zero. I am sure, if you compile this code, "boundary" variable is always zero. But the question is, How I can put silence data in buffer if the received data is not available at time? (to avoid under-run) Is the doc wrong? #define FRAMES 240 #define PERIOD 1*FRAMES #define BUFFER_SIZE PERIOD*2 #define CHANNELS 1 #define SAMPLE_RATE 48000 snd_pcm_hw_params_t *hwparams; snd_pcm_sw_params_t *swparams; int exact_rate,dir; snd_pcm_uframes_t boundary=0; snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; snd_pcm_hw_params_alloca(&hwparams); snd_pcm_sw_params_alloca(&swparams); /*PlayBack hw */ snd_pcm_open(&pcm_handle, "default", stream, 0); snd_pcm_hw_params_any(pcm_handle, hwparams); snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); snd_pcm_hw_params_set_format(pcm_handle, hwparams, SND_PCM_FORMAT_S16_LE); exact_rate = SAMPLE_RATE; snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0); snd_pcm_hw_params_set_channels(pcm_handle, hwparams, CHANNELS); snd_pcm_hw_params_set_buffer_size(pcm_handle, hwparams, BUFFER_SIZE); snd_pcm_hw_params(pcm_handle, hwparams); /*Avoid under-run sw*/ snd_pcm_sw_params_current(pcm_handle, swparams); snd_pcm_sw_params_get_boundary(swparams, &boundary); /*Here, boundary is allways ZERO*/ snd_pcm_sw_params_set_silence_threshold(pcm_handle, swparams, 0); /*According to the doc.*/ snd_pcm_sw_params_set_silence_size(pcm_handle, swparams, boundary); /*According to the doc.*/ snd_pcm_sw_params(pcm_handle,swparams); /*END Avoid under-run*/ snd_pcm_prepare(pcm_handle); Thanks! Nilhcraiv wrote: > If I obtain the boundary for ring pointers in frames at the start > (snd_pcm_sw_params_get_boundary), the boundary is always zero. It is impossible for the boundar to be zero. > Here you can see a light version of my code (without error checking): Error checking would be important. Regards, Clemens

2 1

[alsa-devel] [PATCH v5 0/5] ALSA: jack: Refactoring for jack kctls
by Jie Yang 12 Apr '15

12 Apr '15

Currently only hda will create kctls for hda jacks, for asoc, people may need create jack kctls in specific driver. Here we are introducing kctls for each jack, by creating kctls and add them to jack controls list (considering exist of combo jack). At the same time, we will report events for each control in the list. With this new implementation, both HDA and soc jack kctls works fine, they are compatible for old HDA jack kctls, too. For soc, a. snd_jack_new() with NULL jack_kctl; b. for each pin, call snd_jack_add_kctls() to add one kctl(it will call snd_ctl_add() to add kctl to card); For hda, a. call snd_jack_kctl_new()(in __snd_hda_jack_add_kctl()) to new a jack_kctl(also new kctl); and use snd_hda_ctl_add to add kctl to card; b. new a hda_jack_tbl, appoint jack_tbl->jack_kctl = jack_kctl; c. for non-phantom jack, call snd_jack_new() with this jack_kctl, then the jack_kctl will be added to the new created jack; Changes in v5: 1. remove SND_KCTL_JACK config item, we need jack kctl once CONFIG_SND_JACK is selected. Changes in v4: 1. use snd_ctl_find_id() to get avaliable index; 2. add initial kctl for snd_jack_new(compatible for HDA); 3. add struct snd_jack_kctl * field to struct hda_jack_tbl; 4. new kctls for soc jack during jack pins creating. 5. add a patch to remove exporting snd_kctl_jack_new(). Changes in v3: 1. replace bit index with bit mask in jack_kctl; 2. add exception for SND_JACK_HEADSET and SND_JACK_AVOUT, only create one jack kctl for these two combo jacks, respectively. 3. add NULL check, mem kfree, and fix some potential risk. Change in v2: 1. define jack_kctl struct, and put jack kctl related stuff there; 2. add a patch to remove the existing controls for HDA jack. Jie Yang (5): ALSA: jack: create jack kcontrols for every jack input ALSA: jack: add a parameter to pass kctl for snd_jack_new ALSA: hda - Update to use the new jack kctls method ASoC: jack: create kctls according to jack pins info ALSA: jack: remove export snd_kctl_jack_new() include/sound/jack.h | 25 ++++++- sound/core/Kconfig | 3 - sound/core/Makefile | 3 +- sound/core/ctljack.c | 1 - sound/core/jack.c | 152 +++++++++++++++++++++++++++++++++++++++- sound/pci/hda/Kconfig | 1 - sound/pci/hda/hda_jack.c | 52 +++++++------- sound/pci/hda/hda_jack.h | 4 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 3 +- 10 files changed, 201 insertions(+), 45 deletions(-) -- 1.9.1

2 6

[alsa-devel] [PATCH 0/4] ALSA: ctl: fix userspace control element operations
by Takashi Sakamoto 12 Apr '15

12 Apr '15

This patchset is to fix some issues related to operations for userspace control element. Three patches are related to identical information, the other is related to several element added by one operation. Unfortunately, current alsa-lib has no functionality to achieve the operation to add several element. To demonstrate this and test these patches, I prepare for a small GObject introspection library, alsa-gir. https://github.com/takaswie/alsa-gir This reposiroty includes sample scripts written by python. The file of sample/ctl.py demonstrates userspace control elements. If this library helps your review for this patchset, I'm feeling happy. Takashi Sakamoto (4): ALSA: ctl: confirm to return all identical information in 'activate' event ALSA: ctl: fix a bug to return no identical information in info operation for userspace controls ALSA: ctl: fill identical information to return value when adding userspace elements ALSA: ctl: fix to handle several elements added by one operation for userspace element sound/core/control.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) -- 2.1.0

2 18

[alsa-devel] [PATCH] ASoC: rnsd: fix build regression without CONFIG_OF
by Arnd Bergmann 12 Apr '15

12 Apr '15

The r-car sound driver only works when CONFIG_OF is set, and after a recent change has a compile-time dependency as well: sound/built-in.o: In function `rsnd_dma_request_channel': :(.text+0x9fb84): undefined reference to `of_dma_request_slave_channel' This could be fixed either by adding a static inline wrapper for the function, or by adding a Kconfig dependency. This implements the second approach, which seems appropriate because the driver in fact has a hard dependency. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 72adc61f4637aa3 ("ASoC: rsnd: 1st DMAC dma-names cares subnode") diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 2b3030415573..07114b0b0dc1 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU config SND_SOC_RCAR tristate "R-Car series SRU/SCU/SSIU/SSI support" + depends on DMA_OF select SND_SIMPLE_CARD select REGMAP_MMIO help

2 1

[alsa-devel] [GIT PULL] Last minute ASoC fix for v4.0
by Mark Brown 12 Apr '15

12 Apr '15

The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539: Linux 4.0-rc1 (2015-02-22 18:21:14 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.0-rc7 for you to fetch changes up to 14f0413ce3c400a74213a861bc8f47dca5e4d231: ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 (2015-04-11 22:09:14 +0100) ---------------------------------------------------------------- ASoC: Last minute fix for v4.0 This patch backs out a change that came in during the merge window which selects a configuration for GPIO4 on pcm512x CODECs that may not be suitable for all systems using the device. Changes for v4.1 will make this properly configurable but for now it's safest to revert to the v3.19 behaviour and leave the pin configuration alone. Sorry for sending this direct at the last minute but due to the GPIO misuse it'd be really good to get it in the release and I'd not realised it hadn't been sent yet - between some travel, a job change and other non-urgent fixes coming in I'd lost track of the urgency. It's been in -next for several weeks now, is isolated to the driver and fairly clear to inspection. ---------------------------------------------------------------- Howard Mitchell (1): ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 sound/soc/codecs/pcm512x.c | 19 ------------------- 1 file changed, 19 deletions(-)

1 0

[alsa-devel] Playback - Overwrite buffer with silence
by Nilhcraiv 11 Apr '15

11 Apr '15

Hello, I am working an application and I have problems playing the audio with ALSA. In my application, I receive the sound data, this data must be decoded to be reproduce. In this process, always obtain an under-runerror. To fix this problem, I followed the documentation i.e. I use snd_pcm_sw_params_set_silence_size() and snd_pcm_sw_params_set_silence_threshold() to overwrite the buffer with silence. --> http://www.alsa-project.org/alsa-doc/alsa-lib/group___p_c_m___s_w___params.… but this does not work. Does the doc is wrong? If I obtain the boundary for ring pointers in frames at the start (snd_pcm_sw_params_get_boundary), the boundary is always zero. If I obtain the boundary each time (in the received_data() function) it is more than the buffer size and I get error when I put it in snd_pcm_sw_params_set_silence_size(), ¿Why?, Is it correct to use the boundary value?, ¿How I can avoid under-run by putting silence if I have not data at time? Here you can see a light version of my code (without error checking): #define FRAMES 240 #define PERIOD 1*FRAMES #define BUFFER_SIZE PERIOD*2 #define CHANNELS 1 #define SAMPLE_RATE 48000 snd_pcm_hw_params_t *hwparams; snd_pcm_sw_params_t *swparams; int exact_rate,dir; snd_pcm_uframes_t boundary=0; snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; snd_pcm_hw_params_alloca(&hwparams); snd_pcm_sw_params_alloca(&swparams); /*PlayBack hw */ snd_pcm_open(&pcm_handle, "default", stream, 0); snd_pcm_hw_params_any(pcm_handle, hwparams); snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); snd_pcm_hw_params_set_format(pcm_handle, hwparams, SND_PCM_FORMAT_S16_LE); exact_rate = SAMPLE_RATE; snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0); snd_pcm_hw_params_set_channels(pcm_handle, hwparams, CHANNELS); snd_pcm_hw_params_set_buffer_size(pcm_handle, hwparams, BUFFER_SIZE); snd_pcm_hw_params(pcm_handle, hwparams); /*Avoid under-run sw*/ snd_pcm_sw_params_current(pcm_handle, swparams); snd_pcm_sw_params_get_boundary(swparams, &boundary); /*Here, boundary is allways ZERO*/ snd_pcm_sw_params_set_silence_threshold(pcm_handle, swparams, 0); /*According to the doc.*/ snd_pcm_sw_params_set_silence_size(pcm_handle, swparams, boundary); /*According to the doc.*/ snd_pcm_sw_params(pcm_handle,swparams); /*END Avoid under-run*/ snd_pcm_prepare(pcm_handle); void received_data(void *t_data)/*short version of the function*/ { short *decoded_data = NULL; int len=0; decoded_data = (short *)malloc(PERIOD * FRAME_SIZE); len = decoder(&decoded_data,t_data); snd_pcm_sw_params_get_boundary(swparams, &boundary); /*Here, boundary is always a large number*/ snd_pcm_sw_params_set_silence_size(pcm_handle, swparams, boundary);/*Here, boundary in frames is always a large number, and there are an error...*/ snd_pcm_sw_params(pcm_handle,swparams); pcmreturn = snd_pcm_writei(pcm_handle, decoded_data, len);/*In most cases there are UNDERRUN...*/ xrun_recovery(&pcm_handle, pcmreturn);/*Recover in case of an error.*/ } Thanks in advance! Vicente

2 1

[alsa-devel] [PATCH v2] ALSA: emu10k1: add toggles for E-mu 1010 optical ports
by Michael Gernoth 11 Apr '15

11 Apr '15

The optical ports on the E-mu 1010 (and dock) can be configured for ADAT- or S/PDIF-mode, which is currently hardcoded to ADAT. Add two mixer elements to expose this setting. Tested on an E-mu 1010 PCIe with connected Micro Dock. Signed-off-by: Michael Gernoth <michael(a)gernoth.net> --- sound/pci/emu10k1/emumixer.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 1de3302..55e5716 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -806,6 +806,108 @@ static struct snd_kcontrol_new snd_emu1010_internal_clock = .put = snd_emu1010_internal_clock_put }; +static int snd_emu1010_optical_out_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char * const texts[2] = { + "SPDIF", "ADAT" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, texts); +} + +static int snd_emu1010_optical_out_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = emu->emu1010.optical_out; + return 0; +} + +static int snd_emu1010_optical_out_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + unsigned int val; + u32 tmp; + int change = 0; + + val = ucontrol->value.enumerated.item[0]; + /* Limit: uinfo->value.enumerated.items = 2; */ + if (val >= 2) + return -EINVAL; + change = (emu->emu1010.optical_out != val); + if (change) { + emu->emu1010.optical_out = val; + tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) | + (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0); + snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp); + } + return change; +} + +static struct snd_kcontrol_new snd_emu1010_optical_out = { + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Optical Output Mode", + .count = 1, + .info = snd_emu1010_optical_out_info, + .get = snd_emu1010_optical_out_get, + .put = snd_emu1010_optical_out_put +}; + +static int snd_emu1010_optical_in_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char * const texts[2] = { + "SPDIF", "ADAT" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, texts); +} + +static int snd_emu1010_optical_in_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = emu->emu1010.optical_in; + return 0; +} + +static int snd_emu1010_optical_in_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + unsigned int val; + u32 tmp; + int change = 0; + + val = ucontrol->value.enumerated.item[0]; + /* Limit: uinfo->value.enumerated.items = 2; */ + if (val >= 2) + return -EINVAL; + change = (emu->emu1010.optical_in != val); + if (change) { + emu->emu1010.optical_in = val; + tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) | + (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0); + snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp); + } + return change; +} + +static struct snd_kcontrol_new snd_emu1010_optical_in = { + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Optical Input Mode", + .count = 1, + .info = snd_emu1010_optical_in_info, + .get = snd_emu1010_optical_in_get, + .put = snd_emu1010_optical_in_put +}; + static int snd_audigy_i2c_capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -2051,6 +2153,14 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, snd_ctl_new1(&snd_emu1010_internal_clock, emu)); if (err < 0) return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_out, emu)); + if (err < 0) + return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_in, emu)); + if (err < 0) + return err; } else if (emu->card_capabilities->emu_model) { /* all other e-mu cards for now */ @@ -2086,6 +2196,14 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, snd_ctl_new1(&snd_emu1010_internal_clock, emu)); if (err < 0) return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_out, emu)); + if (err < 0) + return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_in, emu)); + if (err < 0) + return err; } if ( emu->card_capabilities->i2c_adc) { -- 2.1.4

2 1

[alsa-devel] [PATCH] ALSA: emu10k1: add toggles for E-mu 1010 optical ports
by Michael Gernoth 11 Apr '15

11 Apr '15

The optical ports on the E-mu 1010 (and dock) can be configured for ADAT- or SP/DIF-mode, which is currently hardcoded to ADAT. Add two mixer elements to expose this setting. Tested on an E-mu 1010 PCIe with connected micro dock. Signed-off-by: Michael Gernoth <michael(a)gernoth.net> --- sound/pci/emu10k1/emumixer.c | 120 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 1de3302..e0d6053 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -806,6 +806,110 @@ static struct snd_kcontrol_new snd_emu1010_internal_clock = .put = snd_emu1010_internal_clock_put }; +static int snd_emu1010_optical_out_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char * const texts[2] = { + "SPDIF", "ADAT" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, texts); +} + +static int snd_emu1010_optical_out_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = emu->emu1010.optical_out; + return 0; +} + +static int snd_emu1010_optical_out_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + unsigned int val; + u32 tmp; + int change = 0; + + val = ucontrol->value.enumerated.item[0] ; + /* Limit: uinfo->value.enumerated.items = 2; */ + if (val >= 2) + return -EINVAL; + change = (emu->emu1010.optical_out != val); + if (change) { + emu->emu1010.optical_out = val; + tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) | + (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0); + snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp); + } + return change; +} + +static struct snd_kcontrol_new snd_emu1010_optical_out = +{ + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Optical Output Mode", + .count = 1, + .info = snd_emu1010_optical_out_info, + .get = snd_emu1010_optical_out_get, + .put = snd_emu1010_optical_out_put +}; + +static int snd_emu1010_optical_in_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char * const texts[2] = { + "SPDIF", "ADAT" + }; + + return snd_ctl_enum_info(uinfo, 1, 2, texts); +} + +static int snd_emu1010_optical_in_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + + ucontrol->value.enumerated.item[0] = emu->emu1010.optical_in; + return 0; +} + +static int snd_emu1010_optical_in_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol); + unsigned int val; + u32 tmp; + int change = 0; + + val = ucontrol->value.enumerated.item[0] ; + /* Limit: uinfo->value.enumerated.items = 2; */ + if (val >= 2) + return -EINVAL; + change = (emu->emu1010.optical_in != val); + if (change) { + emu->emu1010.optical_in = val; + tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) | + (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0); + snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp); + } + return change; +} + +static struct snd_kcontrol_new snd_emu1010_optical_in = +{ + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Optical Input Mode", + .count = 1, + .info = snd_emu1010_optical_in_info, + .get = snd_emu1010_optical_in_get, + .put = snd_emu1010_optical_in_put +}; + static int snd_audigy_i2c_capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -2051,6 +2155,14 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, snd_ctl_new1(&snd_emu1010_internal_clock, emu)); if (err < 0) return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_out, emu)); + if (err < 0) + return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_in, emu)); + if (err < 0) + return err; } else if (emu->card_capabilities->emu_model) { /* all other e-mu cards for now */ @@ -2086,6 +2198,14 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, snd_ctl_new1(&snd_emu1010_internal_clock, emu)); if (err < 0) return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_out, emu)); + if (err < 0) + return err; + err = snd_ctl_add(card, + snd_ctl_new1(&snd_emu1010_optical_in, emu)); + if (err < 0) + return err; } if ( emu->card_capabilities->i2c_adc) { -- 2.1.4

2 2

[alsa-devel] [PATCH] ALSA: emu10k1: handle dock disconnects
by Michael Gernoth 11 Apr '15

11 Apr '15

When the dock on an E-mu 1010 card is disconnected, all outputs get muted by the hardware. Add logic to detect a disconnect and unmute. Signed-off-by: Michael Gernoth <michael(a)gernoth.net> --- sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index b4458a6..ee50c1d 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -707,6 +707,7 @@ static int emu1010_firmware_thread(void *data) { struct snd_emu10k1 *emu = data; u32 tmp, tmp2, reg; + u32 last_reg = 0; int err; for (;;) { @@ -782,7 +783,15 @@ static int emu1010_firmware_thread(void *data) msleep(10); /* Unmute all. Default is muted after a firmware load */ snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE); + } else if (!reg && last_reg) { + /* Audio Dock removed */ + dev_info(emu->card->dev, + "emu1010: Audio Dock detached\n"); + /* Unmute all */ + snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE); } + + last_reg = reg; } dev_info(emu->card->dev, "emu1010: firmware thread stopping\n"); return 0; -- 2.1.4

2 1

[alsa-devel] [PATCH] ALSA: seq: fill client ID in return value of pool operation
by Takashi Sakamoto 11 Apr '15

11 Apr '15

The returned value of 'get/seq client pool' operation has zeroed value for its client ID, against requested client ID. This commit fix the bug by filling it with index value of referred client object. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/seq/seq_clientmgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 4828765..edbdab8 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -1879,6 +1879,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client, if (cptr == NULL) return -ENOENT; memset(&info, 0, sizeof(info)); + info.client = cptr->number; info.output_pool = cptr->pool->size; info.output_room = cptr->pool->room; info.output_free = info.output_pool; -- 2.1.0

2 1

[alsa-devel] [PATCH 0/2] Cygnus Audio Driver
by Scott Branden 11 Apr '15

11 Apr '15

Please provide comments on the initial version of this driver. This patchset contains the devicetree bindings and core audio driver for the Cygnus SoC. There is an open question on how to fit this driver into the clock framework (if at all). The audio PLL is embedded in the audio block and only used by the audio block. The audio PLL registers are also in the middle of the audio register map. In addition, the audio PLL is adjustable to less than 1 Hz. The existing clock driver framework does not provide a mechanism to take advantage of the resolution of the hardware. Can the audio PLL remain within the audio driver and/or any modifications required? Lori Hikichi (2): ASoC: cygnus-audio: adding device tree bindings ASoC: add core audio driver for Broadcom Cygnus SOC. .../bindings/sound/brcm,cygnus-audio.txt | 68 + sound/soc/bcm/Kconfig | 11 + sound/soc/bcm/Makefile | 5 +- sound/soc/bcm/cygnus-pcm.c | 918 +++++++++++ sound/soc/bcm/cygnus-pcm.h | 45 + sound/soc/bcm/cygnus-ssp.c | 1613 ++++++++++++++++++++ sound/soc/bcm/cygnus-ssp.h | 84 + 7 files changed, 2743 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt create mode 100644 sound/soc/bcm/cygnus-pcm.c create mode 100644 sound/soc/bcm/cygnus-pcm.h create mode 100644 sound/soc/bcm/cygnus-ssp.c create mode 100644 sound/soc/bcm/cygnus-ssp.h -- 2.3.3

4 10

Re: [alsa-devel] [PATCH v3] ASoC: max98090: add shutdown callback for max98090
by anish kumar 11 Apr '15

11 Apr '15

On Fri, Apr 10, 2015 at 5:45 PM, anish singh <anish198519851985(a)gmail.com> wrote: > > ---------- Forwarded message ---------- > From: Caesar Wang <wxt(a)rock-chips.com> > Date: Wed, Apr 8, 2015 at 4:05 AM > Subject: [PATCH v3] ASoC: max98090: add shutdown callback for max98090 > To: Sonny Rao <sonnyrao(a)chromium.org>, Cheng-Yi Chiang > <cychiang(a)chromium.org>, Heiko Stuebner <heiko(a)sntech.de>, Mark Brown > <broonie(a)kernel.org>, zhengxing <zhengxing(a)rock-chips.com>, "jay.xu" > <xjq(a)rock-chips.com> > Cc: devicetree(a)vger.kernel.org, dianders(a)chromium.org, > dri-devel(a)lists.freedesktop.org, linux-kernel(a)vger.kernel.org, > linux-rockchip(a)lists.infradead.org, linux-arm-kernel(a)lists.infradead.org, > Caesar Wang <wxt(a)rock-chips.com>, Jaroslav Kysela <perex(a)perex.cz>, > alsa-devel(a)alsa-project.org, Takashi Iwai <tiwai(a)suse.de>, Dylan Reid > <dgreid(a)chromium.org>, Liam Girdwood <lgirdwood(a)gmail.com>, Lars-Peter > Clausen <lars(a)metafoo.de>, Jarkko Nikula <jarkko.nikula(a)linux.intel.com>, > Tushar Behera <tushar.b(a)samsung.com> > > > To fix pop noise when shutdown,the pop noise during shutdown > is the pmic cutoff power of codec without any notice. > > Signed-off-by: jay.xu <xjq(a)rock-chips.com> > Signed-off-by: zhengxing <zhengxing(a)rock-chips.com> > Signed-off-by: Caesar Wang <wxt(a)rock-chips.com> > > --- > > Changes in v3: > - modify the shutdown function before remove(..) > - fix the `Serien-cc` > > Changes in v2: > - remove the dev_info(..) > - fix the comment style > - add the max98090_i2c_shutdown() in remove() fuction > > sound/soc/codecs/max98090.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c > index b112b1c..3e33ef2 100644 > --- a/sound/soc/codecs/max98090.c > +++ b/sound/soc/codecs/max98090.c > @@ -2605,8 +2605,24 @@ err_enable: > return ret; > } > Please check attached patch and see if it solves your problem. We tested it here with zcd on. +static void max98090_i2c_shutdown(struct i2c_client *i2c) +{ + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); + + dev_info(&i2c->dev, "shut down device\n"); + + /* enable zero crossing */ + regmap_write(max98090->regmap, + M98090_REG_LEVEL_CONTROL, M98090_ZDENN_MASK-1); + + /* turn down volume levels for all the outputs */ + regmap_write(max98090->regmap, + M98090_REG_RCV_LOUTL_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_LOUTR_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_LEFT_SPK_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_RIGHT_SPK_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_LEFT_HP_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_RIGHT_HP_VOLUME, 0x00); + regmap_write(max98090->regmap, + M98090_REG_DEVICE_SHUTDOWN, 0x00); + msleep(40); +} + if it doesn't solve your problem then please dump your registers and send it to us to look further. I assume dapm is turning off the widgets before shutting down the codec. > +static void max98090_i2c_shutdown(struct i2c_client *i2c) > +{ > + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); > + > + /* > + * Enable volume smoothing, disable zero cross. This will cause > + * a quick 40ms ramp to mute on shutdown. > + */ > + regmap_write(max98090->regmap, > + M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK); > + regmap_write(max98090->regmap, > + M98090_REG_DEVICE_SHUTDOWN, 0x00); > + msleep(40); > +} > + > static int max98090_i2c_remove(struct i2c_client *client) > { > + max98090_i2c_shutdown(client); > snd_soc_unregister_codec(&client->dev); > return 0; > } > @@ -2696,6 +2712,7 @@ static struct i2c_driver max98090_i2c_driver = { > .acpi_match_table = ACPI_PTR(max98090_acpi_match), > }, > .probe = max98090_i2c_probe, > + .shutdown = max98090_i2c_shutdown, > .remove = max98090_i2c_remove, > .id_table = max98090_i2c_id, > }; > -- > 1.9.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >

1 0

[alsa-devel] [PATCH] ASoC: codecs-ac97: Remove rate constraints
by Maciej S. Szmigiero 10 Apr '15

10 Apr '15

Remove rate constraints from generic ASoC AC'97 CODEC and make it selectable in config. Supported rates should be detected and constrained anyway by AC'97 generic code - was tested with VT1613 CODEC and iMX6 SSI controller. This way this driver can be used for platforms which don't need specialized AC'97 CODEC drivers while at the same avoiding code duplication from implementing equivalent functionality in a controller driver. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index d0ac723..5b3224c 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -44,10 +44,6 @@ static int ac97_prepare(struct snd_pcm_substream *substream, return snd_ac97_set_rate(ac97, reg, substream->runtime->rate); } -#define STD_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ - SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ - SNDRV_PCM_RATE_48000) - static const struct snd_soc_dai_ops ac97_dai_ops = { .prepare = ac97_prepare, }; @@ -58,13 +54,13 @@ static struct snd_soc_dai_driver ac97_dai = { .stream_name = "AC97 Playback", .channels_min = 1, .channels_max = 2, - .rates = STD_AC97_RATES, + .rates = SNDRV_PCM_RATE_KNOT, .formats = SND_SOC_STD_AC97_FMTS,}, .capture = { .stream_name = "AC97 Capture", .channels_min = 1, .channels_max = 2, - .rates = STD_AC97_RATES, + .rates = SNDRV_PCM_RATE_KNOT, .formats = SND_SOC_STD_AC97_FMTS,}, .ops = &ac97_dai_ops, }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 061c465..84cad9a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -16,7 +16,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_88PM860X if MFD_88PM860X select SND_SOC_L3 select SND_SOC_AB8500_CODEC if ABX500_CORE - select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS + select SND_SOC_AC97_CODEC select SND_SOC_AD1836 if SPI_MASTER select SND_SOC_AD193X_SPI if SPI_MASTER select SND_SOC_AD193X_I2C if I2C @@ -211,8 +211,9 @@ config SND_SOC_AB8500_CODEC tristate config SND_SOC_AC97_CODEC - tristate + tristate "Build generic ASoC AC97 CODEC driver" select SND_AC97_CODEC + select SND_SOC_AC97_BUS config SND_SOC_AD1836 tristate

1 0

[alsa-devel] [PATCH 0/3] ASoC: Intel: IPC/mailbox code refactoring
by Jin Yao 10 Apr '15

10 Apr '15

Hi Mark, Currently in Intel SST driver, some very similar or duplicated IPC/mailbox processing code are used in different platforms. This is a patch series which refactors the common IPC/mailbox code into generic APIs and use the new APIs in Baytrail and Broadwell platforms. This patch series depends on Jie Yang's following patches for build: ASoC: Intel: create atom folder and move atom platform files in ASoC: Intel: create baytrail folder and move baytrail platform files in ASoC: Intel: create boards folder and move sst boards files in ASoC: Intel: create haswell folder and move haswell platform files in ASoC: Intel: create common folder and move common files in Since now Jie Yang's patch series has been applied in intel branch so this patch series will be no build issue. Thanks Jin Yao Jin Yao (3): ASoC: Intel: Refactor common IPC/mailbox code into generic APIs ASoC: Intel: Use the generic IPC/mailbox APIs in Baytrail ASoC: Intel: Use the generic IPC/mailbox APIs in Broadwell sound/soc/intel/baytrail/sst-baytrail-ipc.c | 360 ++++++-------------------- sound/soc/intel/common/Makefile | 3 +- sound/soc/intel/common/sst-ipc.c | 294 +++++++++++++++++++++ sound/soc/intel/common/sst-ipc.h | 91 +++++++ sound/soc/intel/haswell/sst-haswell-ipc.c | 382 +++++++--------------------- 5 files changed, 551 insertions(+), 579 deletions(-) create mode 100644 sound/soc/intel/common/sst-ipc.c create mode 100644 sound/soc/intel/common/sst-ipc.h -- 1.9.1

4 7

[alsa-devel] [PATCH] ASoC: fsl: Add the audio interfacce acronyms in Kconfig text
by Fabio Estevam 10 Apr '15

10 Apr '15

To keep consistency with the other Kconfig entries, use the audio interfacce acronyms (SSI and SPDIF) in the Kconfig menu text. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 081e406..fa44fc6 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -24,7 +24,7 @@ config SND_SOC_FSL_SAI in-tree drivers select it automatically. config SND_SOC_FSL_SSI - tristate "Synchronous Serial Interface module support" + tristate "Synchronous Serial Interface module (SSI) support" select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC) select REGMAP_MMIO @@ -35,7 +35,7 @@ config SND_SOC_FSL_SSI in-tree drivers select it automatically. config SND_SOC_FSL_SPDIF - tristate "Sony/Philips Digital Interface module support" + tristate "Sony/Philips Digital Interface (SPDIF) module support" select REGMAP_MMIO select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC) -- 1.9.1

3 2

[alsa-devel] [PATCH] ASoC: soc-core: call snd_soc_runtime_set_dai_fmt() before soc_new_pcm()
by Kuninori Morimoto 10 Apr '15

10 Apr '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current snd_soc_runtime_set_dai_fmt() is called after soc_probe_link_dais(). this means snd_soc_dai_set_fmt() will be called after soc_new_pcm(). Before appling 1efb53a220b78fdfdbb97b726a2156713e75bdab (ASoC: simple-card: Remove support for setting differing DAI formats) simple-card user had (1) snd_soc_dai_set_fmt() -> soc_new_pcm(), but, after that it is (2) soc_new_pcm() -> snd_soc_dai_set_fmt(). At least rsnd driver is assuming (1) pattern. This patch move snd_soc_dai_set_fmt() into soc_probe_link_dais() after the dai_link->init section to solve this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- >> Mark This patch solves my issue, but I don't know how much effect it has to other drivers. sound/soc/soc-core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 76bfff2..9777e78 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1324,6 +1324,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) } } + if (dai_link->dai_fmt) + snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); + ret = soc_post_component_init(rtd, dai_link->name); if (ret) return ret; @@ -1642,12 +1645,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes, card->num_of_dapm_routes); - for (i = 0; i < card->num_links; i++) { - if (card->dai_link[i].dai_fmt) - snd_soc_runtime_set_dai_fmt(&card->rtd[i], - card->dai_link[i].dai_fmt); - } - snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname), "%s", card->name); snprintf(card->snd_card->longname, sizeof(card->snd_card->longname), -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: fsl_ssi: Use devm_ioremap_resource()
by Fabio Estevam 10 Apr '15

10 Apr '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> Using platform_get_resource() and devm_ioremap_resource() can make the code a bit simpler. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/fsl_ssi.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 143cc16..e8bb8ee 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1288,7 +1288,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) const struct of_device_id *of_id; const char *p, *sprop; const uint32_t *iprop; - struct resource res; + struct resource *res; void __iomem *iomem; char name[64]; @@ -1335,19 +1335,11 @@ static int fsl_ssi_probe(struct platform_device *pdev) } ssi_private->cpu_dai_drv.name = dev_name(&pdev->dev); - /* Get the addresses and IRQ */ - ret = of_address_to_resource(np, 0, &res); - if (ret) { - dev_err(&pdev->dev, "could not determine device resources\n"); - return ret; - } - ssi_private->ssi_phys = res.start; - - iomem = devm_ioremap(&pdev->dev, res.start, resource_size(&res)); - if (!iomem) { - dev_err(&pdev->dev, "could not map device resources\n"); - return -ENOMEM; - } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + iomem = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(iomem)) + return PTR_ERR(iomem); + ssi_private->ssi_phys = res->start; ret = of_property_match_string(np, "clock-names", "ipg"); if (ret < 0) { -- 1.9.1

2 1

Re: [alsa-devel] [Intel-gfx] [PATCH 15/19] drm/i915: HSW cdclk support
by Takashi Iwai 10 Apr '15

10 Apr '15

At Fri, 10 Apr 2015 16:27:39 +0300, Mika Kahola wrote: > > On Thu, 2015-04-09 at 17:17 +0200, Takashi Iwai wrote: > > At Thu, 9 Apr 2015 15:51:27 +0200, > > Daniel Vetter wrote: > > > > > > On Thu, Apr 09, 2015 at 04:41:26PM +0300, Mika Kahola wrote: > > > > On Thu, 2015-04-09 at 11:32 +0200, Daniel Vetter wrote: > > > > > On Thu, Apr 09, 2015 at 10:24:24AM +0300, Mika Kahola wrote: > > > > > > I did some testing on audio part with HDMI-HDMI and DP-HDMI cables > > > > > > connected to my Haswell box. Before applying the patch I tested as a > > > > > > reference with the latest -nightly (04-08-2015), 4.0-rc7. Unfortunately, > > > > > > I failed to get any audio over HDMI cable. For a reference I tested with > > > > > > the very same setup the vanillla kernel from Linus tree 4.0-rc7 and with > > > > > > that kernel the audio worked ok. Then I did some GIT bisecting and it > > > > > > turned out that the first commit that I failed to get audio working was > > > > > > aa2fee4286e43b4784982b17669b02cc99c1ae55. > > > > > > > > > I rerun the bisecting and this time the result was > > > > > > > > commit 0a599838737a2527c35e4d94f794aefe59df1781 > > > > Merge: 2d846c7 a59d719 > > > > Author: Takashi Iwai <tiwai(a)suse.de> > > > > Date: Wed Apr 8 11:29:56 2015 +0200 > > > > > > > > Merge branch 'for-linus' into for-next > > > > > > > > Back merge HD-audio quirks to for-next branch, so that we can apply > > > > a couple of more quirks. > > > > > > > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > > > > > > Adding Takashi and intel audio folks. > > > > The bisecting looks odd. The commit you pointed is a back-merge from > > 4.0-rc to next branch, so this merge itself shouldn't bring so many > > stuff -- at least about the sound part. > > > > The diff in sound/* is found below. As you can see, the only change > > relevant with HDMI is the chunk in sound/pci/hda/hda_intel.c for > > HD-audio controller, but it's specific to Skylake, thus this must be > > irrelevant with your hardware. > > > > Please double-check. > > I double-checked the bisecting and I ended up with the same result. You're > right, it does seems odd why audio on my Haswell box stopped working. > > Any ideas how to proceed from here? Try to check whether the reverting the diff of sound/* manually fixes the problem. (i.e. apply diff -R for the diff I showed in the previous mail.) If it doesn't fix but still reverting the whole commit does fix, it means that something else got broken by the merge. Takashi > > Cheers, > Mika > > > > thanks, > > > > Takashi > > > > === > > % git diff 0a599838737a2527c35e4d94f794aefe59df1781^..0a599838737a2527c35e4d94f794aefe59df1781 sound > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > > index 9bcc5457a83e..e1c210515581 100644 > > --- a/sound/pci/hda/hda_intel.c > > +++ b/sound/pci/hda/hda_intel.c > > @@ -1967,7 +1967,7 @@ static const struct pci_device_id azx_ids[] = { > > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, > > /* Sunrise Point */ > > { PCI_DEVICE(0x8086, 0xa170), > > - .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, > > + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, > > /* Sunrise Point-LP */ > > { PCI_DEVICE(0x8086, 0x9d70), > > .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE }, > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > > index e0c06f9a0e80..7f46d063af57 100644 > > --- a/sound/pci/hda/patch_realtek.c > > +++ b/sound/pci/hda/patch_realtek.c > > @@ -396,7 +396,7 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on) > > { > > /* We currently only handle front, HP */ > > static hda_nid_t pins[] = { > > - 0x0f, 0x10, 0x14, 0x15, 0 > > + 0x0f, 0x10, 0x14, 0x15, 0x17, 0 > > }; > > hda_nid_t *p; > > for (p = pins; *p; p++) > > @@ -2870,6 +2870,8 @@ static void alc283_init(struct hda_codec *codec) > > > > if (!hp_pin) > > return; > > + > > + msleep(30); > > hp_pin_sense = snd_hda_jack_detect(codec, hp_pin); > > > > /* Index 0x43 Direct Drive HP AMP LPM Control 1 */ > > @@ -3564,6 +3566,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_process_coef_fw(codec, coef0255); > > break; > > case 0x10ec0233: > > @@ -3619,6 +3622,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_write_coef_idx(codec, 0x45, 0xc489); > > snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); > > alc_process_coef_fw(codec, coef0255); > > @@ -3688,6 +3692,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_process_coef_fw(codec, coef0255); > > break; > > case 0x10ec0233: > > @@ -3742,6 +3747,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_process_coef_fw(codec, coef0255); > > break; > > case 0x10ec0233: > > @@ -3796,6 +3802,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_process_coef_fw(codec, coef0255); > > break; > > case 0x10ec0233: > > @@ -3841,6 +3848,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) > > > > switch (codec->core.vendor_id) { > > case 0x10ec0255: > > + case 0x10ec0256: > > alc_process_coef_fw(codec, coef0255); > > msleep(300); > > val = alc_read_coef_idx(codec, 0x46); > > @@ -4993,6 +5001,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > > SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC), > > SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK), > > SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), > > + SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK), > > SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), > > SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), > > SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), > > @@ -5173,6 +5182,16 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { > > {0x17, 0x40000000}, > > {0x1d, 0x40700001}, > > {0x21, 0x02211050}), > > + SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, > > + {0x12, 0x90a60140}, > > + {0x13, 0x40000000}, > > + {0x14, 0x90170110}, > > + {0x19, 0x411111f0}, > > + {0x1a, 0x411111f0}, > > + {0x1b, 0x411111f0}, > > + {0x1d, 0x40700001}, > > + {0x1e, 0x411111f0}, > > + {0x21, 0x02211020}), > > SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, > > {0x12, 0x90a60130}, > > {0x13, 0x40000000}, > > diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c > > index 353532b8aee4..8f63e8c8b46c 100644 > > --- a/sound/usb/quirks.c > > +++ b/sound/usb/quirks.c > > @@ -1113,8 +1113,13 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, > > > > bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) > > { > > - /* MS Lifecam HD-5000 doesn't support reading the sample rate. */ > > - return chip->usb_id == USB_ID(0x045E, 0x076D); > > + /* devices which do not support reading the sample rate. */ > > + switch (chip->usb_id) { > > + case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */ > > + case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ > > + return true; > > + } > > + return false; > > } > > > > /* Marantz/Denon USB DACs need a vendor cmd to switch > > > >

1 0

[alsa-devel] [PATCH] ALSA: emu10k1: don't deadlock in proc-functions
by Michael Gernoth 10 Apr '15

10 Apr '15

The functions snd_emu10k1_proc_spdif_read and snd_emu1010_fpga_read acquire the emu_lock before accessing the FPGA. The function used to access the FPGA (snd_emu1010_fpga_read) also tries to take the emu_lock which causes a deadlock. Remove the outer locking in the proc-functions (guarding only the already safe fpga read) to prevent this deadlock. Signed-off-by: Michael Gernoth <michael(a)gernoth.net> --- sound/pci/emu10k1/emuproc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 2ca9f2e..415d23c 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c @@ -245,27 +245,19 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry, u32 rate; if (emu->card_capabilities->emu_model) { - spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x38, &value); - spin_unlock_irqrestore(&emu->emu_lock, flags); if ((value & 0x1) == 0) { - spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x2a, &value); snd_emu1010_fpga_read(emu, 0x2b, &value2); - spin_unlock_irqrestore(&emu->emu_lock, flags); rate = 0x1770000 / (((value << 5) | value2)+1); snd_iprintf(buffer, "ADAT Locked : %u\n", rate); } else { snd_iprintf(buffer, "ADAT Unlocked\n"); } - spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x20, &value); - spin_unlock_irqrestore(&emu->emu_lock, flags); if ((value & 0x4) == 0) { - spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, 0x28, &value); snd_emu1010_fpga_read(emu, 0x29, &value2); - spin_unlock_irqrestore(&emu->emu_lock, flags); rate = 0x1770000 / (((value << 5) | value2)+1); snd_iprintf(buffer, "SPDIF Locked : %d\n", rate); } else { @@ -415,9 +407,7 @@ static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry, snd_iprintf(buffer, "EMU1010 Registers:\n\n"); for(i = 0; i < 0x40; i+=1) { - spin_lock_irqsave(&emu->emu_lock, flags); snd_emu1010_fpga_read(emu, i, &value); - spin_unlock_irqrestore(&emu->emu_lock, flags); snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f); } } -- 2.1.4

2 1

[alsa-devel] ALSA bug tracker link
by maruthi srinivas 10 Apr '15

10 Apr '15

Hi, The link : https://bugtrack.alsa-project.org/alsa-bug isn't working. After searching in web , I found a discussion which says, that link will be down and we need to send alsa-devel mailing list for any bugs. Is there a different bug tracker being used now or reporting to alsa-devel mailing list is the only way ? Please confirm. Regards, Maruthi

2 1

[alsa-devel] [PATCH] ASoC: fsl_ssi: Use devm_snd_soc_register_component()
by Fabio Estevam 10 Apr '15

10 Apr '15

Using devm_snd_soc_register_component() can make the code shorter and cleaner. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/fsl_ssi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 6b0c8f7..143cc16 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1393,8 +1393,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component, - &ssi_private->cpu_dai_drv, 1); + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component, + &ssi_private->cpu_dai_drv, 1); if (ret) { dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); goto error_asoc_register; @@ -1407,13 +1407,13 @@ static int fsl_ssi_probe(struct platform_device *pdev) if (ret < 0) { dev_err(&pdev->dev, "could not claim irq %u\n", ssi_private->irq); - goto error_irq; + goto error_asoc_register; } } ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev); if (ret) - goto error_irq; + goto error_asoc_register; /* * If codec-handle property is missing from SSI node, we assume @@ -1454,9 +1454,6 @@ done: error_sound_card: fsl_ssi_debugfs_remove(&ssi_private->dbg_stats); -error_irq: - snd_soc_unregister_component(&pdev->dev); - error_asoc_register: if (ssi_private->soc->imx) fsl_ssi_imx_clean(pdev, ssi_private); @@ -1472,7 +1469,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) if (ssi_private->pdev) platform_device_unregister(ssi_private->pdev); - snd_soc_unregister_component(&pdev->dev); if (ssi_private->soc->imx) fsl_ssi_imx_clean(pdev, ssi_private); -- 1.9.1

3 2

[alsa-devel] [PATCH] ASoC: ak4642: fixup channels_min
by Kuninori Morimoto 10 Apr '15

10 Apr '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ak4642 doesn't have Mono record, ak4643 have it, but not supported. This patch fixes channel mismatch Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/ak4642.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 24ceb36..13585e8 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -499,13 +499,13 @@ static struct snd_soc_dai_driver ak4642_dai = { .name = "ak4642-hifi", .playback = { .stream_name = "Playback", - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE }, .capture = { .stream_name = "Capture", - .channels_min = 1, + .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16_LE }, -- 1.9.1

2 1

[alsa-devel] [PATCH 0/5] HD-audio widget power-save fixes
by Takashi Iwai 10 Apr '15

10 Apr '15

Hi, this is a series of small fixes for the recently added HD-audio widget power-save feature. Especially the last patch should fix the Realtek codec breakage. The patches are found in topic/hda branch of sound git tree, too. Takashi === Takashi Iwai (5): ALSA: hda/generic - Check power state cap at updating the widget power ALSA: hda/generic - Fix wrong initial power state for fixed pins ALSA: hda/generic - Make snd_hda_gen_path_power_filter() always applicable ALSA: hda/generic - Don't override power_filter when power_save_node is set ALSA: hda/realtek - Fix the regression by widget power-saving sound/pci/hda/hda_generic.c | 23 +++++++++++++++++++---- sound/pci/hda/patch_realtek.c | 5 +++-- 2 files changed, 22 insertions(+), 6 deletions(-) -- 2.3.5

2 7

[alsa-devel] [PATCH 0/3] ARM: shmobile: armadillo: fixup CPU settings
by Kuninori Morimoto 10 Apr '15

10 Apr '15

Hi Mark, Lars Cc Simon These patches had been posted in ALSA/SH-ARM ML in http://thread.gmane.org/gmane.linux.ports.sh.devel/43079 by Lars. But, he doesn't have armadillo board, and I commented about FSI driver, and no one update these, these patches were marooned. Original 2/3 patch changed behavior for clock inversion on FSI driver. FSI + wm8978 on armadillo800eva worked without any issues, but, I don't know how much effect it has for other board (many board are using FSI). We used this inversion flags on each board for historical reasons, but, almost all these were not needed (except some picky board) on FSI. Maybe Lars's 2/3 patch is correct, but, it is difficult to check/confirm for all boards. And unfortunately, Renesas don't use FSI anymore. So, I think keeping current FSI driver as-is is more safety for old boards. I tested these patches on latest Mark's branch Lars-Peter Clausen (3): ARM: shmobile: armadillo800eva: Properly specify HDMI audio link format ARM: shmobile: armadillo800eva: fix clock inversion ASoC: simple-card: Remove support for setting differing DAI formats arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +-- include/sound/simple_card.h | 1 - sound/soc/generic/simple-card.c | 30 ++++++++---------------------- 3 files changed, 9 insertions(+), 25 deletions(-)

4 10

[alsa-devel] [PATCH v2 RESEND] ARM: dts: Support audio on Exynos5422-odroidxu3 using simple-audio-card
by Inha Song 10 Apr '15

10 Apr '15

Add MAX98090 audio codec, I2S interface and the sound nodes to support audio on Exynos5422 SoC Based Odroid-XU3 board. Now we can support audio in Odroid-XU3 board using simple-audio-card DT binding. Signed-off-by: Inha Song <ideal.song(a)samsung.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- arch/arm/boot/dts/exynos5420.dtsi | 9 +++++ arch/arm/boot/dts/exynos5422-odroidxu3.dts | 59 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index ac6f860..73886d6 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -415,6 +415,9 @@ <&clock_audss EXYNOS_I2S_BUS>, <&clock_audss EXYNOS_SCLK_I2S>; clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk0"; + #sound-dai-cells = <1>; samsung,idma-addr = <0x03000000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; @@ -429,6 +432,9 @@ dma-names = "tx", "rx"; clocks = <&clock CLK_I2S1>, <&clock CLK_SCLK_I2S1>; clock-names = "iis", "i2s_opclk0"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk1"; + #sound-dai-cells = <1>; pinctrl-names = "default"; pinctrl-0 = <&i2s1_bus>; status = "disabled"; @@ -442,6 +448,9 @@ dma-names = "tx", "rx"; clocks = <&clock CLK_I2S2>, <&clock CLK_SCLK_I2S2>; clock-names = "iis", "i2s_opclk0"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk2"; + #sound-dai-cells = <1>; pinctrl-names = "default"; pinctrl-0 = <&i2s2_bus>; status = "disabled"; diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts index edc25cf..c038f0d 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts @@ -11,6 +11,7 @@ */ /dts-v1/; +#include <dt-bindings/sound/samsung-i2s.h> #include "exynos5800.dtsi" / { @@ -285,6 +286,64 @@ rtc@101E0000 { status = "okay"; }; + + sound: sound { + compatible = "simple-audio-card"; + + simple-audio-card,name = "Odroid-XU3"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Speakers", "Speakers"; + simple-audio-card,routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Headphone Jack", "MICBIAS", + "IN1", "Headphone Jack", + "Speakers", "SPKL", + "Speakers", "SPKR"; + + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&link0_codec>; + simple-audio-card,frame-master = <&link0_codec>; + + simple-audio-card,cpu { + sound-dai = <&i2s0 0>; + system-clock-frequency = <19200000>; + }; + + link0_codec: simple-audio-card,codec { + sound-dai = <&max98090>; + clocks = <&i2s0 CLK_I2S_CDCLK>; + }; + }; +}; + +&clock_audss { + assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>, + <&clock_audss EXYNOS_MOUT_I2S>, + <&clock_audss EXYNOS_DOUT_AUD_BUS>; + assigned-clock-parents = <&clock CLK_FIN_PLL>, + <&clock_audss EXYNOS_MOUT_AUDSS>; + assigned-clock-rates = <0>, + <0>, + <19200000>; +}; + +&hsi2c_5 { + status = "okay"; + max98090: max98090@10 { + compatible = "maxim,max98090"; + reg = <0x10>; + interrupt-parent = <&gpx3>; + interrupts = <2 0>; + clocks = <&i2s0 CLK_I2S_CDCLK>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + }; +}; + +&i2s0 { + status = "okay"; }; &hdmi { -- 2.0.0.390.gcb682f8

1 0

Re: [alsa-devel] [PATCH 1/2] ASoC: davinci: Clear VCIF read FIFO on errors
by Peter Ujfalusi 10 Apr '15

10 Apr '15

On 04/10/2015 02:00 AM, Alexey Ignatov wrote: > Clearing VCIF read FIFO on overflow and underflow events fixes audio glitching > when DMA load is high. This happened when simultaneously capturing and encoding > video and audio, for example. > > Signed-off-by: Alexey Ignatov <lexszero(a)gmail.com> > --- > sound/soc/davinci/davinci-vcif.c | 60 +++++++++++++++++++++++++++++++++++++--- > 1 file changed, 56 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c > index 5bee0427..0d8014e 100644 > --- a/sound/soc/davinci/davinci-vcif.c > +++ b/sound/soc/davinci/davinci-vcif.c > @@ -45,6 +45,10 @@ > } \ > } while (0) > > +#define DAVINCI_VC_INT_RERR_MASK \ > + (DAVINCI_VC_INT_RERRUDR_MASK | \ > + DAVINCI_VC_INT_RERROVF_MASK) > + > struct davinci_vcif_dev { > struct davinci_vc *davinci_vc; > struct davinci_pcm_dma_params dma_params[2]; > @@ -87,6 +91,22 @@ static void davinci_vcif_stop(struct snd_pcm_substream *substream) > writel(w, davinci_vc->base + DAVINCI_VC_CTRL); > } > > +static void davinci_vcif_interrupts(struct snd_pcm_substream *substream, > + int enable) > +{ > + struct snd_soc_pcm_runtime *rtd = substream->private_data; > + struct davinci_vcif_dev *davinci_vcif_dev = > + snd_soc_dai_get_drvdata(rtd->cpu_dai); > + struct davinci_vc *davinci_vc = davinci_vcif_dev->davinci_vc; > + > + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { > + writel(DAVINCI_VC_INT_RERR_MASK, > + davinci_vc->base + DAVINCI_VC_INTCLR); > + writel(enable ? DAVINCI_VC_INT_RERR_MASK : 0, > + davinci_vc->base + DAVINCI_VC_INTEN); > + } > +} > + > static int davinci_vcif_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params, > struct snd_soc_dai *dai) > @@ -104,10 +124,6 @@ static int davinci_vcif_hw_params(struct snd_pcm_substream *substream, > /* General line settings */ > writel(DAVINCI_VC_CTRL_MASK, davinci_vc->base + DAVINCI_VC_CTRL); > > - writel(DAVINCI_VC_INT_MASK, davinci_vc->base + DAVINCI_VC_INTCLR); > - > - writel(DAVINCI_VC_INT_MASK, davinci_vc->base + DAVINCI_VC_INTEN); > - > w = readl(davinci_vc->base + DAVINCI_VC_CTRL); > > /* Determine xfer data type */ > @@ -149,6 +165,32 @@ static int davinci_vcif_hw_params(struct snd_pcm_substream *substream, > return 0; > } > > +static irqreturn_t davinci_vcif_irq_handler(int irq, void *data) > +{ > + struct davinci_vcif_dev *davinci_vcif_dev = data; > + struct davinci_vc *davinci_vc = davinci_vcif_dev->davinci_vc; > + uint32_t w; > + > + w = readl(davinci_vc->base + DAVINCI_VC_INTSTATUS); > + > + if (w & DAVINCI_VC_INT_RERR_MASK) { > + pr_debug("vc overflow or underflow occurred, resetting fifo\n"); > + > + w = readl(davinci_vc->base + DAVINCI_VC_CTRL); > + MOD_REG_BIT(w, DAVINCI_VC_CTRL_RFIFOCL, 1); > + writel(w, davinci_vc->base + DAVINCI_VC_CTRL); > + > + w = readl(davinci_vc->base + DAVINCI_VC_CTRL); > + MOD_REG_BIT(w, DAVINCI_VC_CTRL_RFIFOCL, 0); > + writel(w, davinci_vc->base + DAVINCI_VC_CTRL); > + > + writel(DAVINCI_VC_INT_RERR_MASK, > + davinci_vc->base + DAVINCI_VC_INTCLR); > + } > + > + return IRQ_HANDLED; > +} > + > static int davinci_vcif_trigger(struct snd_pcm_substream *substream, int cmd, > struct snd_soc_dai *dai) > { > @@ -159,10 +201,12 @@ static int davinci_vcif_trigger(struct snd_pcm_substream *substream, int cmd, > case SNDRV_PCM_TRIGGER_RESUME: > case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: > davinci_vcif_start(substream); > + davinci_vcif_interrupts(substream, 1); > break; > case SNDRV_PCM_TRIGGER_STOP: > case SNDRV_PCM_TRIGGER_SUSPEND: > case SNDRV_PCM_TRIGGER_PAUSE_PUSH: > + davinci_vcif_interrupts(substream, 0); > davinci_vcif_stop(substream); > break; > default: > @@ -178,6 +222,7 @@ static int davinci_vcif_startup(struct snd_pcm_substream *substream, > struct davinci_vcif_dev *dev = snd_soc_dai_get_drvdata(dai); > > snd_soc_dai_set_dma_data(dai, substream, dev->dma_params); > + > return 0; > } > > @@ -238,6 +283,13 @@ static int davinci_vcif_probe(struct platform_device *pdev) > > dev_set_drvdata(&pdev->dev, davinci_vcif_dev); > > + ret = devm_request_irq(&pdev->dev, IRQ_MBXINT, davinci_vcif_irq_handler, > + 0, "vcif", davinci_vcif_dev); > + if (ret != 0) { > + dev_err(&pdev->dev, "could not request irq: %d\n", ret); > + return ret; > + } I would make this optional to avoid regression if the arch patch is not present. > + > ret = snd_soc_register_component(&pdev->dev, &davinci_vcif_component, > &davinci_vcif_dai, 1); > if (ret != 0) { > -- Péter

1 0

[alsa-devel] ASoC: Mediatek: Add support for MT8173 SOC
by Koro Chen 10 Apr '15

10 Apr '15

This adds basic support for the Mediatek AFE unit for MT8173 SoC. This patch is based on Linux 4.0-rc1, Sascha's clk patch [1], and his SCPSYS power patch [2]. The AFE unit comprises several memory interfaces that communicate with CPU, a multi input multi output digital audio interconnect, and several external interfaces (e.g. I2S). The AFE unit is a DMA master, so no external DMA engine is needed. Each external interface is presented as a DAI to ASoC. A memory interface must be connected via the interconnect to an external interface. The connection pathes are configured through the device tree. [1] http://lists.infradead.org/pipermail/linux-mediatek/2015-March/000079.html [2] http://lists.infradead.org/pipermail/linux-mediatek/2015-March/000132.html Koro Chen (2): ASoC: mediatek: Add binding support for AFE driver ASoC: mediatek: Add AFE platform driver .../devicetree/bindings/sound/mtk-afe-pcm.txt | 105 ++ include/dt-bindings/sound/mtk-afe.h | 36 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/mediatek/Kconfig | 8 + sound/soc/mediatek/Makefile | 2 + sound/soc/mediatek/mtk-afe-common.h | 105 ++ sound/soc/mediatek/mtk-afe-connection.c | 416 ++++++ sound/soc/mediatek/mtk-afe-connection.h | 30 + sound/soc/mediatek/mtk-afe-pcm.c | 1497 ++++++++++++++++++++ 10 files changed, 2201 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt create mode 100644 include/dt-bindings/sound/mtk-afe.h create mode 100644 sound/soc/mediatek/Kconfig create mode 100644 sound/soc/mediatek/Makefile create mode 100644 sound/soc/mediatek/mtk-afe-common.h create mode 100644 sound/soc/mediatek/mtk-afe-connection.c create mode 100644 sound/soc/mediatek/mtk-afe-connection.h create mode 100644 sound/soc/mediatek/mtk-afe-pcm.c --

1 1

[alsa-devel] [PATCH 00/14] parport: check success of attach call
by Sudip Mukherjee 10 Apr '15

10 Apr '15

Currently we are not checking if attach has succeeded or not. Also parport_register_driver() always return 0 even if attach fails. But in many places where attach has been used, it can fail. So, modified the parport code to check the return value of attach and accordingly return either 0 or error code from parport_register_driver. Sudip Mukherjee (14): parport: return value of attach and parport_register_driver ALSA: portman2x4: return proper error values from attach ALSA: mts64: return proper error values from attach staging: panel: return proper error values from attach spi: lm70llp: return proper error values from attach spi: butterfly: return proper error values from attach [SCSI] ppa: return proper error values from attach [SCSI] imm: return proper error values from attach pps: return proper error values from attach pps: return proper error values from attach net: plip: return proper error values from attach i2c-parport: return proper error values from attach ppdev: return proper error values from attach char: lp: return proper error values from attach drivers/char/lp.c | 16 +++++++++++----- drivers/char/ppdev.c | 10 +++++++--- drivers/i2c/busses/i2c-parport.c | 7 ++++--- drivers/net/plip/plip.c | 16 ++++++++++------ drivers/parport/share.c | 20 +++++++++++++++----- drivers/pps/clients/pps_parport.c | 7 ++++--- drivers/pps/generators/pps_gen_parport.c | 9 +++++---- drivers/scsi/imm.c | 4 ++-- drivers/scsi/ppa.c | 4 ++-- drivers/spi/spi-butterfly.c | 7 ++++--- drivers/spi/spi-lm70llp.c | 7 ++++--- drivers/staging/panel/panel.c | 11 ++++++----- include/linux/parport.h | 2 +- sound/drivers/mts64.c | 13 ++++++++----- sound/drivers/portman2x4.c | 15 ++++++++++----- 15 files changed, 93 insertions(+), 55 deletions(-) -- 1.8.1.2

6 26

Re: [alsa-devel] [PATCH 2/2] ASoC: add core audio driver for Broadcom Cygnus SOC.
by Mark Brown 10 Apr '15

10 Apr '15

On Thu, Apr 02, 2015 at 11:47:18AM -0700, Lori Hikichi wrote: > On 15-03-30 11:42 PM, Mark Brown wrote: > >>+config SND_SOC_CYGNUS > >>+ tristate "SoC platform audio for Broadcom Cygnus chips" > >>+ depends on ARCH_BCM_CYGNUS || COMPILE_TEST > >>+ default ARCH_BCM_CYGNUS > Okay. You don't need to reply to every single comment, the general assumption will be that if there's no other followup all review comments will be addressed. It's better to just reply to things where there's something more detailed to say, if you explicitly reply to everything then that makes it easier for actual replies to be missed since there's a lot of there's a lot of the mail that's just going to be skipped through. > >>+static void ringbuf_inc(void __iomem *audio_io, bool is_playback, > >>+ const struct ringbuf_regs *p_rbuf) > >So it looks like we're getting an interrupt per period and we have to > >manually advance to the next one? > Yes. OK, so that seems fragile - what happens if we're slightly late processing an interrupt or miss one entirely? Most hardware has some way to read back the current position which tends to be more reliable, is that not an option here?

2 3