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

Re: [alsa-devel] [ALSA] Enable capture from line-in and CD on Revolution 5.1
by Dan Carpenter 26 Jun '13

26 Jun '13

[ This warning is very old, but I was working on some related code and didn't know how to fix it ]. Hello Jochen Voss, This is a semi-automatic email about new static checker warnings. The patch a58e7cb16dfa: "[ALSA] Enable capture from line-in and CD on Revolution 5.1" from Oct 4, 2006, leads to the following Smatch complaint: sound/i2c/other/ak4xxx-adda.c:808 build_adc_controls() error: we previously assumed 'ak->adc_info' could be null (see line 789) sound/i2c/other/ak4xxx-adda.c 788 if (ak->type == SND_AK5365 && (idx % 2) == 0) { 789 if (! ak->adc_info || ^^^^^^^^^^^^ Old check. 790 ! ak->adc_info[mixer_ch].switch_name) { 791 knew.name = "Capture Switch"; 792 knew.index = mixer_ch + ak->idx_offset * 2; 793 } else 794 knew.name = ak->adc_info[mixer_ch].switch_name; 795 knew.info = ak4xxx_switch_info; 796 knew.get = ak4xxx_switch_get; 797 knew.put = ak4xxx_switch_put; 798 knew.access = 0; 799 /* register 2, bit 0 (SMUTE): 0 = normal operation, 800 1 = mute */ 801 knew.private_value = 802 AK_COMPOSE(idx/2, 2, 0, 0) | AK_INVERT; 803 err = snd_ctl_add(ak->card, snd_ctl_new1(&knew, ak)); 804 if (err < 0) 805 return err; 806 807 memset(&knew, 0, sizeof(knew)); 808 knew.name = ak->adc_info[mixer_ch].selector_name; ^^^^^^^^^^^^^^^^^^^^^ New dereference. 809 if (!knew.name) { 810 knew.name = "Capture Channel"; regards, dan carpenter

1 0

[alsa-devel] [PATCH] ASoC: wm9705: Remove noisy print on boot
by Mark Brown 25 Jun '13

25 Jun '13

There's no content in the announcement. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/wm9705.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 05b1f34..a5fc61d 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -337,8 +337,6 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) { int ret = 0; - printk(KERN_INFO "WM9705 SoC Audio Codec\n"); - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "wm9705: failed to register AC97 codec\n"); -- 1.8.3.1

1 0

[alsa-devel] [PATCH] ASoC: stac9766: Remove version number
by Mark Brown 25 Jun '13

25 Jun '13

There is no need to have versioning beyond that for the kernel, especially when the version number never gets updated. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/stac9766.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 2eda85ba..cbc7ae3 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -28,8 +28,6 @@ #include "stac9766.h" -#define STAC9766_VERSION "0.10" - /* * STAC9766 register cache */ @@ -338,8 +336,6 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec) { int ret = 0; - printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION); - ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) goto codec_err; -- 1.8.3.1

1 0

Re: [alsa-devel] [RFC PATCH v2 00/12] ARM: s3c64xx: Let amba-pl08x driver handle DMA
by Mark Brown 25 Jun '13

25 Jun '13

On Tue, Jun 25, 2013 at 01:22:20PM +0200, Tomasz Figa wrote: > On Tuesday 25 of June 2013 11:28:18 Mark Brown wrote: > > On my non-DT s3c64xx system I get this when trying to use SPI for the > > first time: > Could you clarify first time? Does it work on further retries? No, the system appears to lock up fairly solidly - I suspect poor error handling in the SPI driver. > > [ 1.739385] s3c64xx-spi s3c6410-spi.0: Failed to get RX DMA channel > > [ 1.743437] spi_master spi0: failed to prepare transfer hardware > > though I haven't yet tried your clock patches (there were some conficts > > that I didn't get round to picking up yet). > This shouldn't really matter, as long as the pl080 drivers probes > correctly. Indeed, I was wondering if it was failing to probe due to not getting its clocks though since that's another area you've been actively working on.

1 0

[alsa-devel] [PATCH 1/5] ASoC: codecs: tas5086: fix documentation
by Daniel Mack 25 Jun '13

25 Jun '13

The property 'ti,charge-period' must be given in nanoseconds, not microseconds. Signed-off-by: Daniel Mack <zonque(a)gmail.com> --- Documentation/devicetree/bindings/sound/ti,tas5086.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/ti,tas5086.txt b/Documentation/devicetree/bindings/sound/ti,tas5086.txt index 8ea4f5b..e8310f1 100644 --- a/Documentation/devicetree/bindings/sound/ti,tas5086.txt +++ b/Documentation/devicetree/bindings/sound/ti,tas5086.txt @@ -11,7 +11,7 @@ Optional properties: chip's !RESET pin. If specified, the driver will assert a hardware reset at probe time. - - ti,charge-period: This property should contain the time in microseconds + - ti,charge-period: This property should contain the time in nanoseconds that closely matches the external single-ended split-capacitor charge period. The hardware chip waits for this period of time before starting the -- 1.8.1.4

2 7

[alsa-devel] [PATCH] ASoC: Tegra and i.MX are mutually exclusive
by Arnd Bergmann 25 Jun '13

25 Jun '13

Both Tegra and i.MX provide ac97 operations, which can only exist once in the kernel. They can both be built as loadable modules (only one of them needs to be loaded anyway), but we have to disallow enabling them both as built-in. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3843a18..5958948 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -99,6 +99,7 @@ endif # SND_POWERPC_SOC menuconfig SND_IMX_SOC tristate "SoC Audio for Freescale i.MX CPUs" depends on ARCH_MXC + depends on SND_SOC_TEGRA=n || (SND_SOC_TEGRA=m && m) help Say Y or M if you want to add support for codecs attached to the i.MX CPUs.

4 4

[alsa-devel] [PATCH] snd-firewire-lib: remove unused header inclusion
by Takashi Sakamoto 25 Jun '13

25 Jun '13

spinlock is not used in amdtp.h. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h index b680c5e..f6103d6 100644 --- a/sound/firewire/amdtp.h +++ b/sound/firewire/amdtp.h @@ -3,7 +3,6 @@ #include <linux/interrupt.h> #include <linux/mutex.h> -#include <linux/spinlock.h> #include "packets-buffer.h" /** -- 1.7.10.4

2 1

[alsa-devel] [PATCH] ALSA: hda - clean up code to reset hda link
by mengdong.lin＠intel.com 25 Jun '13

25 Jun '13

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch is a cleanup to the previous patch "reset hda link during system/ runtime suspend". In this patch - azx_enter_link_reset() and azx_exit_link_reset() are defined for entering and exiting the link reset respectively. azx_link_reset() is no longer used and replaced by azx_enter_link_reset(). - azx_reset() reuses the above two new functions for a link reset cycle 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 9f110c7..f39de90 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1121,7 +1121,7 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus, #endif /* enter link reset */ -static void azx_reset_link(struct azx *chip) +static void azx_enter_link_reset(struct azx *chip) { unsigned long timeout; @@ -1134,11 +1134,22 @@ static void azx_reset_link(struct azx *chip) usleep_range(500, 1000); } -/* reset codec link */ -static int azx_reset(struct azx *chip, int full_reset) +/* exit link reset */ +static void azx_exit_link_reset(struct azx *chip) { unsigned long timeout; + azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | ICH6_GCTL_RESET); + + timeout = jiffies + msecs_to_jiffies(100); + while (!azx_readb(chip, GCTL) && + time_before(jiffies, timeout)) + usleep_range(500, 1000); +} + +/* reset codec link */ +static int azx_reset(struct azx *chip, int full_reset) +{ if (!full_reset) goto __skip; @@ -1146,12 +1157,7 @@ static int azx_reset(struct azx *chip, int full_reset) azx_writeb(chip, STATESTS, STATESTS_INT_MASK); /* reset controller */ - azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET); - - timeout = jiffies + msecs_to_jiffies(100); - while (azx_readb(chip, GCTL) && - time_before(jiffies, timeout)) - usleep_range(500, 1000); + azx_enter_link_reset(chip); /* delay for >= 100us for codec PLL to settle per spec * Rev 0.9 section 5.5.1 @@ -1159,12 +1165,7 @@ static int azx_reset(struct azx *chip, int full_reset) usleep_range(500, 1000); /* Bring controller out of reset */ - azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | ICH6_GCTL_RESET); - - timeout = jiffies + msecs_to_jiffies(100); - while (!azx_readb(chip, GCTL) && - time_before(jiffies, timeout)) - usleep_range(500, 1000); + azx_exit_link_reset(chip); /* Brent Chartrand said to wait >= 540us for codecs to initialize */ usleep_range(1000, 1200); @@ -2908,7 +2909,7 @@ static int azx_suspend(struct device *dev) if (chip->initialized) snd_hda_suspend(chip->bus); azx_stop_chip(chip); - azx_reset_link(chip); + azx_enter_link_reset(chip); if (chip->irq >= 0) { free_irq(chip->irq, chip); chip->irq = -1; @@ -2961,7 +2962,7 @@ static int azx_runtime_suspend(struct device *dev) struct azx *chip = card->private_data; azx_stop_chip(chip); - azx_reset_link(chip); + azx_enter_link_reset(chip); azx_clear_irq_pending(chip); return 0; } -- 1.7.10.4

2 1

[alsa-devel] [PATCH] ALSA: hda - Add In-driver connection info
by Wang Xingchao 25 Jun '13

25 Jun '13

Pin's connection list may change dynamically with hot-plug event on Intel Haswell chip. Users would see connections be "0" in codec#. when play audio on this pin, software driver choose converter from cache connections. So add "In-driver connection" info to avoid confuse when raw connections are different with cache connection. Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> --- sound/pci/hda/hda_proc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 0fee8fa..9760f00 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -504,6 +504,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, int conn_len) { int c, curr = -1; + const hda_nid_t *list; + int cache_len; if (conn_len > 1 && wid_type != AC_WID_AUD_MIX && @@ -521,6 +523,19 @@ static void print_conn_list(struct snd_info_buffer *buffer, } snd_iprintf(buffer, "\n"); } + + /* Get Cache connections info */ + cache_len = snd_hda_get_conn_list(codec, nid, &list); + if (cache_len != conn_len + || memcmp(list, conn, conn_len)) { + snd_iprintf(buffer, " In-driver Connection: %d\n", cache_len); + if (cache_len > 0) { + snd_iprintf(buffer, " "); + for (c = 0; c < cache_len; c++) + snd_iprintf(buffer, " 0x%02x", list[c]); + snd_iprintf(buffer, "\n"); + } + } } static void print_gpio(struct snd_info_buffer *buffer, -- 1.8.1.2

2 1

[alsa-devel] [PATCH v3 0/3] ASoC: codecs: some more improvements for adau1701
by Daniel Mack 25 Jun '13

25 Jun '13

v3: - fixed documentation for adi,pll-clkdiv - droped implicit I2C_M_STOP - moved regcache_sync() to adau1761_reset() - added regcache_mark_dirty() - made gpio_pll_mode and array - dropped ADAU1701_CLKDIV_MCLK_LRCLK Thanks for the review, Lars! Daniel Mack (3): ASoC: codecs: adau1701: allow configuration of PLL mode pins ASoC: codecs: adau1701: switch to direct regmap API usage ASoC: codecs: adau1701: add support for pin muxing .../devicetree/bindings/sound/adi,adau1701.txt | 21 ++ sound/soc/codecs/adau1701.c | 248 ++++++++++++++++----- 2 files changed, 214 insertions(+), 55 deletions(-) -- 1.8.1.4

5 11