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

[alsa-devel] [RFC PATCH 0/2] ALSA: hda - patch set for DP MST audio support
by libin.yang＠linux.intel.com 09 Nov '15

09 Nov '15

From: Libin Yang <libin.yang(a)linux.intel.com> This is one of the patch sets to support DP MST audio. This patch set is to support dynamic PCM attachment to pin As there are still other patches, it may be better to put the patches in a specific branch? Libin Yang (2): ALSA: hda - add hda_dev_t typedef for DP MST audio ALSA: hda - HDMI codec driver dynamically attach PCM include/sound/hdaudio.h | 1 + sound/pci/hda/hda_codec.c | 5 +- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/patch_hdmi.c | 170 +++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 163 insertions(+), 14 deletions(-) -- 1.9.1

3 12

[alsa-devel] [PATCH v3 0/6] ASoC: Add HDA HDMI codec driver
by Vinod Koul 09 Nov '15

09 Nov '15

Hi all, This is third series of the HDA HDMI patches. This attempts to add HDA based HDMI driver and uses i915 component framework to interact with display for power up/down. The communication to codec is over HDA link If at all we need a change in interface, we can i915 interface which can be made transparent to users Due to dependency on already merged patches in ALSA tree, it would be best if this get merged thru ALSA tree Changes in v3: - add comment in hdmi driver and changlog on basic support and eventual addition of features Changes in v2: - remove infoframe open code and use video one - add pm on/off i915 triggers - add ext_dma_params struct *** SUBJECT HERE *** *** BLURB HERE *** Subhransu S. Prusty (6): ALSA: hdac: structure definition for ext_dma_params ASoC: hdac-hdmi: Add hdmi driver ASoC: hdac_hdmi: Add PM support for HDMI ASoC: hdac_hdmi: Add hdac hdmi dai ops ASoC: hdac_hdmi: Setup and start infoframe ASoC: hdac_hdmi: Use i915 component framework for PM include/sound/hdaudio_ext.h | 6 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hdmi.c | 660 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 673 insertions(+) create mode 100644 sound/soc/codecs/hdac_hdmi.c -- 2.4.3

3 14

[alsa-devel] [PATCH v3 0/3] ASoC: rockchip: i2s: add 8 channels capture support and share lrck
by Sugar Zhang 09 Nov '15

09 Nov '15

support 8 channels capture support. share lrck tx/rx when symmetric_rates enabled. Sugar Zhang (3): ASoC: rockchip: i2s: add 8 channels capture support Documentation: DT bindings: rockchip-i2s: add capture property ASoC: rockchip: i2s: share tx/rx lrck when symmetric_rates enabled .../devicetree/bindings/sound/rockchip-i2s.txt | 5 +++ sound/soc/rockchip/rockchip_i2s.c | 48 +++++++++++++++++++++- sound/soc/rockchip/rockchip_i2s.h | 16 ++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) -- 2.3.6

3 6

[alsa-devel] [PATCH] ALSA: ctxfi: constify dao and dai rsc ops structures
by Julia Lawall 08 Nov '15

08 Nov '15

The dao and dai rsc ops structures are never modified, so declare them as const. Done with the help of Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> --- sound/pci/ctxfi/ctdaio.c | 4 ++-- sound/pci/ctxfi/ctdaio.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index 9b87dd2..2221d7c 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -263,7 +263,7 @@ static int dao_clear_right_input(struct dao *dao) return 0; } -static struct dao_rsc_ops dao_ops = { +static const struct dao_rsc_ops dao_ops = { .set_spos = dao_spdif_set_spos, .commit_write = dao_commit_write, .get_spos = dao_spdif_get_spos, @@ -318,7 +318,7 @@ static int dai_commit_write(struct dai *dai) return 0; } -static struct dai_rsc_ops dai_ops = { +static const struct dai_rsc_ops dai_ops = { .set_srt_srcl = dai_set_srt_srcl, .set_srt_srcr = dai_set_srt_srcr, .set_srt_msr = dai_set_srt_msr, diff --git a/sound/pci/ctxfi/ctdaio.h b/sound/pci/ctxfi/ctdaio.h index 0ebbf35..a30be73 100644 --- a/sound/pci/ctxfi/ctdaio.h +++ b/sound/pci/ctxfi/ctdaio.h @@ -51,7 +51,7 @@ struct daio { struct dao { struct daio daio; - struct dao_rsc_ops *ops; /* DAO specific operations */ + const struct dao_rsc_ops *ops; /* DAO specific operations */ struct imapper **imappers; struct daio_mgr *mgr; struct hw *hw; @@ -60,7 +60,7 @@ struct dao { struct dai { struct daio daio; - struct dai_rsc_ops *ops; /* DAI specific operations */ + const struct dai_rsc_ops *ops; /* DAI specific operations */ struct hw *hw; void *ctrl_blk; };

1 0

[alsa-devel] [PATCH] ALSA: oxfw: add an comment to Kconfig for TASCAM FireOne
by Takashi Sakamoto 08 Nov '15

08 Nov '15

A commit to add support for this model should have added a comment about this model to Kconfig. Fixes: 759a2f40c9fa('ALSA: oxfw: add an entry for TASCAM FireOne') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index bee0e5f..e92a6d9 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig @@ -38,6 +38,7 @@ config SND_OXFW * Mackie(Loud) Tapco Link.Firewire * Mackie(Loud) d.2 pro/d.4 pro * Mackie(Loud) U.420/U.420d + * TASCAM FireOne To compile this driver as a module, choose M here: the module will be called snd-oxfw. -- 2.5.0

2 1

[alsa-devel] ALSA: USB-audio: Add quirk for Zoom R16/24 playback
by Alain 07 Nov '15

07 Nov '15

What kernel version did you used to apply the patchs? I tried with 4.3 and usbausio.c, endpoint.c and pcm.c can't be patched Thanks

1 0

[alsa-devel] [PATCH] sound: fix check for error condition of register_chrdev()
by Alexey Khoroshilov 07 Nov '15

07 Nov '15

init_oss_soundcore() compares returned value of register_chrdev() with -1, while other error codes can be returned. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov(a)ispras.ru> --- sound/sound_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/sound_core.c b/sound/sound_core.c index 11e953a1fa45..99b73c675743 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -655,7 +655,7 @@ static void cleanup_oss_soundcore(void) static int __init init_oss_soundcore(void) { if (preclaim_oss && - register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops) == -1) { + register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops) < 0) { printk(KERN_ERR "soundcore: sound device already in use.\n"); return -EBUSY; } -- 1.9.1

2 1

[alsa-devel] [PATCH v2 0/2] Add audio support for Broadcom Cygnus SoC
by Simran Rai 06 Nov '15

06 Nov '15

Hi, This patchset contains audio support for Broadcom's Cygnus SoC. It contains DT bindings and core audio driver. The audio driver supports both capture and playback of Audio PCM samples over I2S/TDM interface and provides playback support over SPDIF interface. This patchset is derived from a previously submitted patchset: http://lkml.iu.edu/hypermail/linux/kernel/1503.3/05434.html This patchset has been tested on Cygnus wireless audio bcm958305K board. It is based on v4.3-rc5 and is available from github: repo: https://github.com/Broadcom/cygnus-linux/tree/cygnus-sound-v2 Changes from v1: - Address code review comments. Fixed print format of type size_t and pointer. Simran Rai (2): dt-bindings: sound: Add DT bindings for Broadcom Cygnus audio VOIP-5227 Add Broadcom Cygnus audio driver. .../bindings/sound/brcm,cygnus-audio.txt | 63 + sound/soc/bcm/Kconfig | 18 + sound/soc/bcm/Makefile | 5 + sound/soc/bcm/cygnus-pcm.c | 903 ++++++++++++ sound/soc/bcm/cygnus-ssp.c | 1532 ++++++++++++++++++++ sound/soc/bcm/cygnus-ssp.h | 129 ++ 6 files changed, 2650 insertions(+) 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-ssp.c create mode 100644 sound/soc/bcm/cygnus-ssp.h -- 1.7.9.5

2 8

[alsa-devel] [PATCH] ASoC: wm9713: add gpio chip
by Robert Jarzmik 06 Nov '15

06 Nov '15

The Wolfson WM9713 provides 8 GPIOs. If the gpiolib is compiled in the kernel, declare a gpio chip. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- sound/soc/codecs/wm9713.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm9713.h | 1 + 2 files changed, 124 insertions(+) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 79e143625ac3..904fe4fc5bf1 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/gpio/driver.h> #include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> @@ -33,11 +34,21 @@ #define WM9713_VENDOR_ID 0x574d4c13 #define WM9713_VENDOR_ID_MASK 0xffffffff +#define AC97_GPIO_PUSH_PULL 0x58 + +struct wm9713_gpio_priv { +#ifdef CONFIG_GPIOLIB + struct gpio_chip gpio_chip; +#endif + struct snd_soc_codec *codec; +}; + struct wm9713_priv { struct snd_ac97 *ac97; u32 pll_in; /* PLL input frequency */ unsigned int hp_mixer[2]; struct mutex lock; + struct wm9713_gpio_priv *gpio_priv; }; #define HPL_MIXER 0 @@ -1202,10 +1213,116 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) return ret; } +#ifdef CONFIG_GPIOLIB +static inline struct snd_soc_codec *gpio_to_codec(struct gpio_chip *chip) +{ + struct wm9713_gpio_priv *gpio_priv = + container_of(chip, struct wm9713_gpio_priv, gpio_chip); + + return gpio_priv->codec; +} + +static int wm9713_gpio_request(struct gpio_chip *chip, unsigned offset) +{ + if (offset >= WM9713_NUM_GPIOS) + return -EINVAL; + + return 0; +} + +static int wm9713_gpio_direction_in(struct gpio_chip *chip, unsigned offset) +{ + struct snd_soc_codec *codec = gpio_to_codec(chip); + + return snd_soc_update_bits(codec, AC97_GPIO_CFG, + 1 << (offset + 1), 1 << (offset + 1)); +} + +static int wm9713_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + struct snd_soc_codec *codec = gpio_to_codec(chip); + int ret; + + ret = snd_soc_read(codec, AC97_GPIO_STATUS); + + return ret < 0 ? ret : ret & (1 << (offset + 1)); +} + +static void wm9713_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +{ + struct snd_soc_codec *codec = gpio_to_codec(chip); + + snd_soc_update_bits(codec, AC97_GPIO_PUSH_PULL, + 1 << offset | (1 << (offset + 8)), + 1 << (offset + 8 * !!value)); +} + +static int wm9713_gpio_direction_out(struct gpio_chip *chip, + unsigned offset, int value) +{ + struct snd_soc_codec *codec = gpio_to_codec(chip); + + wm9713_gpio_set(chip, offset, value); + + return snd_soc_update_bits(codec, AC97_GPIO_CFG, 1 << (offset + 1), 0); +} + +static struct gpio_chip wm9713_gpio_chip = { + .label = "wm9713", + .owner = THIS_MODULE, + .request = wm9713_gpio_request, + .direction_input = wm9713_gpio_direction_in, + .get = wm9713_gpio_get, + .direction_output = wm9713_gpio_direction_out, + .set = wm9713_gpio_set, + .can_sleep = 1, +}; + +static int wm9713_init_gpio(struct snd_soc_codec *codec) +{ + struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + struct wm9713_gpio_priv *gpio_priv; + int ret; + + gpio_priv = devm_kzalloc(codec->dev, sizeof(*wm9713->gpio_priv), + GFP_KERNEL); + if (!gpio_priv) + return -ENOMEM; + wm9713->gpio_priv = gpio_priv; + gpio_priv->codec = codec; + gpio_priv->gpio_chip = wm9713_gpio_chip; + gpio_priv->gpio_chip.ngpio = WM9713_NUM_GPIOS; + gpio_priv->gpio_chip.dev = codec->dev; + gpio_priv->gpio_chip.base = -1; + + ret = gpiochip_add(&gpio_priv->gpio_chip); + if (ret != 0) + dev_err(codec->dev, "Failed to add GPIOs: %d\n", ret); + return ret; +} + +static void wm9713_free_gpio(struct snd_soc_codec *codec) +{ + struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + + gpiochip_remove(&wm9713->gpio_priv->gpio_chip); +} +#else +static int wm9713_init_gpio(struct snd_soc_codec *codec) +{ + return 0; +} + +static void wm9713_free_gpio(struct snd_soc_codec *codec) +{ +} +#endif + static int wm9713_soc_probe(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); struct regmap *regmap; + int ret; wm9713->ac97 = snd_soc_new_ac97_codec(codec, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); @@ -1223,6 +1340,11 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) /* unmute the adc - move to kcontrol */ snd_soc_update_bits(codec, AC97_CD, 0x7fff, 0x0000); + ret = wm9713_init_gpio(codec); + if (ret) { + snd_soc_free_ac97_codec(wm9713->ac97); + return ret; + } return 0; } @@ -1230,6 +1352,7 @@ static int wm9713_soc_remove(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + wm9713_free_gpio(codec); snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9713->ac97); return 0; diff --git a/sound/soc/codecs/wm9713.h b/sound/soc/codecs/wm9713.h index 53df11b1f727..d72f96e653d1 100644 --- a/sound/soc/codecs/wm9713.h +++ b/sound/soc/codecs/wm9713.h @@ -45,4 +45,5 @@ #define WM9713_DAI_AC97_AUX 1 #define WM9713_DAI_PCM_VOICE 2 +#define WM9713_NUM_GPIOS 8 #endif -- 2.1.4

4 9

[alsa-devel] Applied "ASoC: rockchip: i2s: change bclk and lrck according to sample rates" to the asoc tree
by Mark Brown 06 Nov '15

06 Nov '15

The patch ASoC: rockchip: i2s: change bclk and lrck according to sample rates has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From daf7fdaa9909c22a30504f3fbf64861f6fb222af Mon Sep 17 00:00:00 2001 From: Caesar Wang <wxt(a)rock-chips.com> Date: Fri, 6 Nov 2015 19:38:14 +0800 Subject: [PATCH] ASoC: rockchip: i2s: change bclk and lrck according to sample rates This patch sets the dividers autonomously. when i2s works on master mode, and sample rates changed. We need to change bclk and lrck at the same time for cpu internal side. As the input source clock to the module is MCLK_I2S, and by the divider of the module, the clock generator generates SCLK and LRCK to transmitter and receiver. Signed-off-by: Caesar Wang <wxt(a)rock-chips.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/rockchip/rockchip_i2s.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 58ee645..ce880f3 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -41,6 +41,7 @@ struct rk_i2s_dev { */ bool tx_start; bool rx_start; + bool is_master_mode; }; static int i2s_runtime_suspend(struct device *dev) @@ -174,9 +175,11 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, case SND_SOC_DAIFMT_CBS_CFS: /* Set source clock in Master mode */ val = I2S_CKR_MSS_MASTER; + i2s->is_master_mode = true; break; case SND_SOC_DAIFMT_CBM_CFM: val = I2S_CKR_MSS_SLAVE; + i2s->is_master_mode = false; break; default: return -EINVAL; @@ -228,6 +231,26 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, struct rk_i2s_dev *i2s = to_info(dai); struct snd_soc_pcm_runtime *rtd = substream->private_data; unsigned int val = 0; + unsigned int mclk_rate, bclk_rate, div_bclk, div_lrck; + + if (i2s->is_master_mode) { + mclk_rate = clk_get_rate(i2s->mclk); + bclk_rate = 2 * 32 * params_rate(params); + if (bclk_rate && mclk_rate % bclk_rate) + return -EINVAL; + + div_bclk = mclk_rate / bclk_rate; + div_lrck = bclk_rate / params_rate(params); + regmap_update_bits(i2s->regmap, I2S_CKR, + I2S_CKR_MDIV_MASK, + I2S_CKR_MDIV(div_bclk)); + + regmap_update_bits(i2s->regmap, I2S_CKR, + I2S_CKR_TSD_MASK | + I2S_CKR_RSD_MASK, + I2S_CKR_TSD(div_lrck) | + I2S_CKR_RSD(div_lrck)); + } switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: -- 2.6.1

1 0