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

[alsa-devel] [asoc:topic/simple 19/20] sound/soc/generic/simple-card.c:350:8: error: implicit declaration of function 'asoc_simple_card_parse_clk_cpu'
by kbuild test robot 05 Aug '16

05 Aug '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/simple head: c9a235da8a61cf9af7653fca341ded0881a64eca commit: 28abd99b6e40741cd0e75be20817f23a3044d338 [19/20] ASoC: simple-card: use asoc_simple_card_parse_clk() config: i386-randconfig-s0-08050951 (attached as .config) compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705 reproduce: git checkout 28abd99b6e40741cd0e75be20817f23a3044d338 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/generic/simple-card.c: In function 'asoc_simple_card_dai_link_of': >> sound/soc/generic/simple-card.c:350:8: error: implicit declaration of function 'asoc_simple_card_parse_clk_cpu' [-Werror=implicit-function-declaration] ret = asoc_simple_card_parse_clk_cpu(cpu, dai_link, cpu_dai); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> sound/soc/generic/simple-card.c:354:8: error: implicit declaration of function 'asoc_simple_card_parse_clk_codec' [-Werror=implicit-function-declaration] ret = asoc_simple_card_parse_clk_codec(codec, dai_link, codec_dai); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors -- /kbuild/src/rand/sound/soc/generic/simple-card.c: In function 'asoc_simple_card_dai_link_of': >> /kbuild/src/rand/sound/soc/generic/simple-card.c:350:8: error: implicit declaration of function 'asoc_simple_card_parse_clk_cpu' [-Werror=implicit-function-declaration] ret = asoc_simple_card_parse_clk_cpu(cpu, dai_link, cpu_dai); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> /kbuild/src/rand/sound/soc/generic/simple-card.c:354:8: error: implicit declaration of function 'asoc_simple_card_parse_clk_codec' [-Werror=implicit-function-declaration] ret = asoc_simple_card_parse_clk_codec(codec, dai_link, codec_dai); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/asoc_simple_card_parse_clk_cpu +350 sound/soc/generic/simple-card.c 344 ret = asoc_simple_card_sub_parse_of(plat, NULL, 345 &dai_link->platform_of_node, 346 NULL, NULL); 347 if (ret < 0) 348 goto dai_link_of_err; 349 > 350 ret = asoc_simple_card_parse_clk_cpu(cpu, dai_link, cpu_dai); 351 if (ret < 0) 352 goto dai_link_of_err; 353 > 354 ret = asoc_simple_card_parse_clk_codec(codec, dai_link, codec_dai); 355 if (ret < 0) 356 goto dai_link_of_err; 357 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

Re: [alsa-devel] [PATCH 10/11] soc: ti: knav_qmss_queue: use of_property_read_bool
by Julia Lawall 05 Aug '16

05 Aug '16

On Fri, 5 Aug 2016, Robin Murphy wrote: > Hi Julia, > > On 05/08/16 09:56, Julia Lawall wrote: > > Use of_property_read_bool to check for the existence of a property. > > This caught my eye since Rob told me off for doing the same recently[1]. > > > The semantic patch that makes this change is as follows: > > (http://coccinelle.lip6.fr/) > > > > // <smpl> > > @@ > > expression e1,e2; > > statement S2,S1; > > @@ > > - if (of_get_property(e1,e2,NULL)) > > + if (of_property_read_bool(e1,e2)) > > S1 else S2 > > // </smpl> > > > > Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> > > > > --- > > drivers/soc/ti/knav_qmss_queue.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c > > index b73e353..56b5d7c 100644 > > --- a/drivers/soc/ti/knav_qmss_queue.c > > +++ b/drivers/soc/ti/knav_qmss_queue.c > > @@ -1240,7 +1240,7 @@ static int knav_setup_queue_range(struct knav_device *kdev, > > if (of_get_property(node, "qalloc-by-id", NULL)) > > According to the binding, "qalloc-by-id" _is_ a boolean property, so > this one really does deserve to be of_property_read_bool()... > > > range->flags |= RANGE_RESERVED; > > > > - if (of_get_property(node, "accumulator", NULL)) { > > + if (of_property_read_bool(node, "accumulator")) { > > ...whereas "accumulator" must have a value, so this isn't technically > appropriate. In general, most of these "if the property exists, read the > property and do stuff" checks are probably a sign of code that could be > simplified by refactoring the "do stuff" step to just specifically > handle the "read the property" step returning -EINVAL when it's not present. Thanks for the very helpful feedback. I will rethink the patch set in light of this information. julia > Robin. > > [1]:https://www.mail-archive.com/iommu@lists.linux-foundation.org/msg13375.h… > > > ret = knav_init_acc_range(kdev, node, range); > > if (ret < 0) { > > devm_kfree(dev, range); > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel(a)lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >

1 0

[alsa-devel] [PATCH 00/11] use of_property_read_bool
by Julia Lawall 05 Aug '16

05 Aug '16

Use of_property_read_bool to check for the existence of a property. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e1,e2; statement S2,S1; @@ - if (of_get_property(e1,e2,NULL)) + if (of_property_read_bool(e1,e2)) S1 else S2 // </smpl> --- arch/powerpc/sysdev/mpic.c | 2 +- drivers/i2c/busses/i2c-mpc.c | 2 +- drivers/mmc/host/sdhci-of-esdhc.c | 2 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 3 +-- drivers/phy/phy-qcom-ufs.c | 2 +- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +- drivers/soc/fsl/qe/qe_tdm.c | 2 +- drivers/soc/ti/knav_qmss_queue.c | 2 +- drivers/tty/serial/atmel_serial.c | 8 ++++---- drivers/usb/host/fsl-mph-dr-of.c | 6 +++--- sound/soc/codecs/ab8500-codec.c | 10 +++++----- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/soc-core.c | 2 +- 13 files changed, 22 insertions(+), 23 deletions(-)

2 2

[alsa-devel] [PATCH 0/2 v2] DesignWare HDMI I2S suport
by Kuninori Morimoto 05 Aug '16

05 Aug '16

Hi Thierry, Russell, Mark These are v2 of DesignWare HDMI I2S support patches. It will use ALSA SoC hdmi-codec driver, but we can't use it as-is at this point. 1) patch tidyup hdmi-codec driver to enable dw-hdmi I2S support. 2) patch is based on it. Difficult is that these 2 patches are under different maintainer. Kuninori Morimoto (2): 1) ASoC: hdmi-codec: enable multi probe for same device 2) drm: bridge: add DesignWare HDMI I2S audio support drivers/gpu/drm/bridge/Kconfig | 8 ++++++++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-hdmi-audio.h | 7 +++++++ drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw-hdmi.c | 22 ++++++++++++++++++-- drivers/gpu/drm/bridge/dw-hdmi.h | 21 +++++++++++++++++++ sound/soc/codecs/hdmi-codec.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 251 insertions(+), 5 deletions(-) -- 1.9.1

2 3

[alsa-devel] [PATCH v7] ASoC: rockchip: Add machine driver for RK3399 GRU Boards
by Xing Zheng 05 Aug '16

05 Aug '16

Because we need to support the multiple codecs (MAX98357A/RT5514/DA7219) on the RK3399 GRU boards, this patch can help us to support these codecs. Signed-off-by: Xing Zheng <zhengxing(a)rock-chips.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes in v7: - add default MCLK and PLL settings for the da7219_init() so that the accessory detection works as expected Changes in v6: - remove enable/disable dapm pins, and to switch codecs via user space - fix "Speaker" dapm route for max98357a - add SND_JACK_LINEOUT flag for da7219 jack detection Changes in v5: - fix the build warning for missing I2C/CLKDEV_LOOKUP dependency Changes in v4: - the compatible name needs to be based on a single reference design, and the name of the board is called "GRU" - use one i2sX card "rockchip,cpu = <&i2s0>" instead of array that is based on GRU - rename DOC to rockchip,rk3399-gru-sound.txt - rename compatible to rockchip,rk3399-gru-sound - rename source code to rk3399_gru_sound.c Changes in v3: - rename DOC to rockchip,rk3399-max98357a-rt5514-da7219.txt - rename compatible to rockchip,rk3399-max98357a-rt5514-da7219 - rename source code to rk3399_max98357a_rt5514_da7219.c Changes in v2: - use the FS 256 to set mclks of the max98357a and rt5514 danamically - add more sample rate for da7219 .../bindings/sound/rockchip,rk3399-gru-sound.txt | 15 + sound/soc/rockchip/Kconfig | 11 + sound/soc/rockchip/Makefile | 2 + sound/soc/rockchip/rk3399_gru_sound.c | 337 ++++++++++++++++++++ 4 files changed, 365 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt new file mode 100644 index 0000000..f19b6c8 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt @@ -0,0 +1,15 @@ +ROCKCHIP with MAX98357A/RT5514/DA7219 codecs on GRU boards + +Required properties: +- compatible: "rockchip,rk3399-gru-sound" +- rockchip,cpu: The phandle of the Rockchip I2S controller that's + connected to the codecs +- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs + +Example: + +sound { + compatible = "rockchip,rk3399-gru-sound"; + rockchip,cpu = <&i2s0>; + rockchip,codec = <&max98357a &rt5514 &da7219>; +}; diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index f1e0c70..6d39032 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -41,3 +41,14 @@ config SND_SOC_ROCKCHIP_RT5645 help Say Y or M here if you want to add support for SoC audio on Rockchip boards using the RT5645/RT5650 codec, such as Veyron. + +config SND_SOC_RK3399_GRU_SOUND + tristate "ASoC support multiple codecs for Rockchip RK3399 GRU boards" + depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP + select SND_SOC_ROCKCHIP_I2S + select SND_SOC_MAX98357A + select SND_SOC_RT5514 + select SND_SOC_DA7219 + help + Say Y or M here if you want to add support multiple codecs for SoC + audio on Rockchip RK3399 GRU boards. diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile index c0bf560..84e5c7c 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -7,6 +7,8 @@ obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o snd-soc-rockchip-max98090-objs := rockchip_max98090.o snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o +snd-soc-rk3399-gru-sound-objs := rk3399_gru_sound.o obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o obj-$(CONFIG_SND_SOC_ROCKCHIP_RT5645) += snd-soc-rockchip-rt5645.o +obj-$(CONFIG_SND_SOC_RK3399_GRU_SOUND) += snd-soc-rk3399-gru-sound.o diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c new file mode 100644 index 0000000..9933703 --- /dev/null +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -0,0 +1,337 @@ +/* + * Rockchip machine ASoC driver for boards using MAX98357A/RT5514/DA7219 + * + * Copyright (c) 2016, ROCKCHIP CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/delay.h> +#include <linux/spi/spi.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include "rockchip_i2s.h" +#include "../codecs/da7219.h" +#include "../codecs/da7219-aad.h" +#include "../codecs/rt5514.h" + +#define DRV_NAME "rk3399-gru-sound" + +#define SOUND_FS 256 + +static struct snd_soc_jack rockchip_sound_jack; + +static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphones", NULL), + SND_SOC_DAPM_SPK("Speakers", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), +}; + +static const struct snd_soc_dapm_route rockchip_dapm_routes[] = { + /* Input Lines */ + {"MIC", NULL, "Headset Mic"}, + {"DMIC1L", NULL, "Int Mic"}, + {"DMIC1R", NULL, "Int Mic"}, + + /* Output Lines */ + {"Headphones", NULL, "HPL"}, + {"Headphones", NULL, "HPR"}, + {"Speakers", NULL, "Speaker"}, +}; + +static const struct snd_kcontrol_new rockchip_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphones"), + SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Int Mic"), +}; + +static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + unsigned int mclk; + int ret; + + /* max98357a supports these sample rates */ + switch (params_rate(params)) { + case 8000: + case 16000: + case 48000: + case 96000: + mclk = params_rate(params) * SOUND_FS; + break; + default: + dev_err(rtd->card->dev, "%s() doesn't support this sample rate: %d\n", + __func__, params_rate(params)); + return -EINVAL; + } + + ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0); + if (ret) { + dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n", + __func__, mclk, ret); + return ret; + } + + return 0; +} + +static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + unsigned int mclk; + int ret; + + mclk = params_rate(params) * SOUND_FS; + + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, + SND_SOC_CLOCK_OUT); + if (ret < 0) { + dev_err(rtd->card->dev, "Can't set cpu clock out %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, RT5514_SCLK_S_MCLK, + mclk, SND_SOC_CLOCK_IN); + if (ret) { + dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n", + __func__, params_rate(params) * 512, ret); + return ret; + } + + return 0; +} + +static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int mclk, ret; + + /* in bypass mode, the mclk has to be one of the frequencies below */ + switch (params_rate(params)) { + case 8000: + case 16000: + case 24000: + case 32000: + case 48000: + case 64000: + case 96000: + mclk = 12288000; + break; + case 11025: + case 22050: + case 44100: + case 88200: + mclk = 11289600; + break; + default: + return -EINVAL; + } + + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, + SND_SOC_CLOCK_OUT); + if (ret < 0) { + dev_err(codec_dai->dev, "Can't set cpu clock out %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(codec_dai->dev, "Can't set codec clock in %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0); + if (ret < 0) { + dev_err(codec_dai->dev, "Can't set pll sysclk mclk %d\n", ret); + return ret; + } + + return 0; +} + +static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec_dais[0]->codec; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* We need default MCLK and PLL settings for the accessory detection */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, 12288000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(codec_dai->dev, "Init can't set codec clock in %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0); + if (ret < 0) { + dev_err(codec_dai->dev, "Init can't set pll sysclk mclk %d\n", ret); + return ret; + } + + /* Enable Headset and 4 Buttons Jack detection */ + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", + SND_JACK_HEADSET | SND_JACK_LINEOUT | + SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3, + &rockchip_sound_jack, NULL, 0); + + if (ret) { + dev_err(rtd->card->dev, "New Headset Jack failed! (%d)\n", ret); + return ret; + } + + da7219_aad_jack_det(codec, &rockchip_sound_jack); + + return 0; +} + +static struct snd_soc_ops rockchip_sound_max98357a_ops = { + .hw_params = rockchip_sound_max98357a_hw_params, +}; + +static struct snd_soc_ops rockchip_sound_rt5514_ops = { + .hw_params = rockchip_sound_rt5514_hw_params, +}; + +static struct snd_soc_ops rockchip_sound_da7219_ops = { + .hw_params = rockchip_sound_da7219_hw_params, +}; + +enum { + DAILINK_MAX98357A, + DAILINK_RT5514, + DAILINK_DA7219, +}; + +static struct snd_soc_dai_link rockchip_dailinks[] = { + [DAILINK_MAX98357A] = { + .name = "MAX98357A", + .stream_name = "MAX98357A PCM", + .codec_dai_name = "HiFi", + .ops = &rockchip_sound_max98357a_ops, + /* set max98357a as slave */ + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, + [DAILINK_RT5514] = { + .name = "RT5514", + .stream_name = "RT5514 PCM", + .codec_dai_name = "rt5514-aif1", + .ops = &rockchip_sound_rt5514_ops, + /* set rt5514 as slave */ + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, + [DAILINK_DA7219] = { + .name = "DA7219", + .stream_name = "DA7219 PCM", + .codec_dai_name = "da7219-hifi", + .init = rockchip_sound_da7219_init, + .ops = &rockchip_sound_da7219_ops, + /* set da7219 as slave */ + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, +}; + +static struct snd_soc_card rockchip_sound_card = { + .name = "rk3399-gru-sound", + .owner = THIS_MODULE, + .dai_link = rockchip_dailinks, + .num_links = ARRAY_SIZE(rockchip_dailinks), + .dapm_widgets = rockchip_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets), + .dapm_routes = rockchip_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes), + .controls = rockchip_controls, + .num_controls = ARRAY_SIZE(rockchip_controls), +}; + +static int rockchip_sound_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &rockchip_sound_card; + struct device_node *cpu_node; + int i, ret; + + cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); + if (!cpu_node) { + dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n"); + return -EINVAL; + } + + for (i = 0; i < card->num_links; i++) { + rockchip_dailinks[i].platform_of_node = cpu_node; + rockchip_dailinks[i].cpu_of_node = cpu_node; + + rockchip_dailinks[i].codec_of_node = + of_parse_phandle(pdev->dev.of_node, "rockchip,codec", i); + if (!rockchip_dailinks[i].codec_of_node) { + dev_err(&pdev->dev, + "Property[%d] 'rockchip,codec' missing or invalid\n", i); + return -EINVAL; + } + } + + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); + + return ret; +} + +static const struct of_device_id rockchip_sound_of_match[] = { + { .compatible = "rockchip,rk3399-gru-sound", }, + {}, +}; + +static struct platform_driver rockchip_sound_driver = { + .probe = rockchip_sound_probe, + .driver = { + .name = DRV_NAME, + .of_match_table = rockchip_sound_of_match, +#ifdef CONFIG_PM + .pm = &snd_soc_pm_ops, +#endif + }, +}; + +module_platform_driver(rockchip_sound_driver); + +MODULE_AUTHOR("Xing Zheng <zhengxing(a)rock-chips.com>"); +MODULE_DESCRIPTION("Rockchip ASoC Machine Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); +MODULE_DEVICE_TABLE(of, rockchip_sound_of_match); -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: dwc: Drop DMA channel names assignment
by Sylwester Nawrocki 05 Aug '16

05 Aug '16

The dw_configure_dai_by_dt() function and further dev->{play,capture} _dma_data.dt data structures seem to be used in this driver only in case of a system using devicetree, thus chan_name assignments have no effect since they will be ignored in dmaengine_pcm_request_chan_of() call and will be substituted with values taken form dmaengine_pcm_dma_channel_names[] table ("tx", "rx"). Also there is no any "TX", "RX" dma-names entries in arch/arm/boot/dts, only lower case "tx", "rx" seem to be used. Lastly, this driver doesn't set SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag when registering a dmaengine PCM to indicate the chan_name should be used. My intention is to eventually remove the struct snd_dmaengine_dai_dma_data chan_name field as there is also a chan_names[] field in struct snd_dmaengine_pcm_config which can be used for same purpose. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/dwc/designware_i2s.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index dc97f43..2998954 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -577,7 +577,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, dev->capability |= DWC_I2S_PLAY; dev->play_dma_data.dt.addr = res->start + I2S_TXDMA; dev->play_dma_data.dt.addr_width = bus_widths[idx]; - dev->play_dma_data.dt.chan_name = "TX"; dev->play_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2]) >> 8; dev->play_dma_data.dt.maxburst = 16; @@ -588,7 +587,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev, dev->capability |= DWC_I2S_RECORD; dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA; dev->capture_dma_data.dt.addr_width = bus_widths[idx]; - dev->capture_dma_data.dt.chan_name = "RX"; dev->capture_dma_data.dt.fifo_size = fifo_depth * (fifo_width[idx2] >> 8); dev->capture_dma_data.dt.maxburst = 16; -- 1.9.1

2 1

[alsa-devel] [PATCH 0/3] ASoC: topology: Add support for BE DAIs
by mengdong.lin＠linux.intel.com 05 Aug '16

05 Aug '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> There is topology ABI udpate in this series. Topology core can check size of each ABI objects to detect version mismatch between user space and kernel. This series adds support for BE (Back End) DAIs: - Define the type and ABI struct for Backend DAIs. - The topology core can configure an existing BE DAI or create new BE DAIs. The user space series "topology: Add support for BE DAIs" is also submitted. Is it possible to meet the timeline of v4.8? There will be 2 pairs of kernel & user space series for PCM & BE links later. Mengdong Lin (3): ASoC: topology: ABI - Add the types for BE DAI ASoC: topology: Add support for configuring existing BE DAIs ASoC: topology: Able to create BE DAIs include/sound/soc-topology.h | 1 + include/uapi/sound/asoc.h | 34 +++++++++- sound/soc/soc-core.c | 3 +- sound/soc/soc-topology.c | 156 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 189 insertions(+), 5 deletions(-) -- 2.5.0

2 5

[alsa-devel] [PATCH RESEND 7/8] ASoC: samsung: s3c24xx_uda134x: debug/error trace cleanup
by Sylwester Nawrocki 05 Aug '16

05 Aug '16

Switch from pr_* to dev_* macros and drop some debug traces. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- Rebased onto topic/samsung branch. sound/soc/samsung/s3c24xx_uda134x.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 13e52fb..1619e76 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c @@ -62,18 +62,18 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) #endif mutex_lock(&clk_lock); - pr_debug("%s %d\n", __func__, clk_users); + if (clk_users == 0) { xtal = clk_get(rtd->dev, "xtal"); if (IS_ERR(xtal)) { - printk(KERN_ERR "%s cannot get xtal\n", __func__); + dev_err(rtd->dev, "%s cannot get xtal\n", __func__); ret = PTR_ERR(xtal); } else { pclk = clk_get(&s3c24xx_uda134x_snd_device->dev, "pclk"); if (IS_ERR(pclk)) { - printk(KERN_ERR "%s cannot get pclk\n", - __func__); + dev_err(rtd->dev, "%s cannot get pclk\n", + __func__); clk_put(xtal); ret = PTR_ERR(pclk); } @@ -99,8 +99,8 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates); if (ret < 0) - printk(KERN_ERR "%s cannot set constraints\n", - __func__); + dev_err(rtd->dev, "%s cannot set constraints\n", + __func__); #endif } return ret; @@ -109,7 +109,6 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) static void s3c24xx_uda134x_shutdown(struct snd_pcm_substream *substream) { mutex_lock(&clk_lock); - pr_debug("%s %d\n", __func__, clk_users); clk_users -= 1; if (clk_users == 0) { clk_put(xtal); @@ -156,18 +155,19 @@ static int s3c24xx_uda134x_hw_params(struct snd_pcm_substream *substream, clk_source = S3C24XX_CLKSRC_PCLK; div = bi % 33; } - pr_debug("%s desired rate %lu, %d\n", __func__, rate, bi); + + dev_dbg(rtd->dev, "%s desired rate %lu, %d\n", __func__, rate, bi); clk = (fs_mode == S3C2410_IISMOD_384FS ? 384 : 256) * rate; - pr_debug("%s will use: %s %s %d sysclk %d err %ld\n", __func__, - fs_mode == S3C2410_IISMOD_384FS ? "384FS" : "256FS", - clk_source == S3C24XX_CLKSRC_MPLL ? "MPLLin" : "PCLK", - div, clk, err); + + dev_dbg(rtd->dev, "%s will use: %s %s %d sysclk %d err %ld\n", __func__, + fs_mode == S3C2410_IISMOD_384FS ? "384FS" : "256FS", + clk_source == S3C24XX_CLKSRC_MPLL ? "MPLLin" : "PCLK", + div, clk, err); if ((err * 100 / rate) > 5) { - printk(KERN_ERR "S3C24XX_UDA134X: effective frequency " - "too different from desired (%ld%%)\n", - err * 100 / rate); + dev_err(rtd->dev, "effective frequency too different " + "from desired (%ld%%)\n", err * 100 / rate); return -EINVAL; } -- 1.9.1

2 4

[alsa-devel] [PATCH 00/12] ASoC: Intel: Skylake: Add support for library load
by Vinod Koul 05 Aug '16

05 Aug '16

This patch series adds support for library loading. A module maybe part of base firmware or in a different library. A library may have one or more modules. The names of library to be loaded are passed as topology manifest data. The library list is loaded after base FW during dsp init. So we add support library load IPC and the usage in broxton ops for loading libs. To load a list of lib(s) coming from topology, we need to split DSP init, into object creation and fw_init. The fw_init is invoked from soc-probe after topology is initialized. Now fw is initialized later, so module UUID query was move to runtime as the firmware is not available at topology initialization. While at it, also fix the parsing UUIDs only once for SKL and BXT ops and one comment code style. Lastly this series adds support for specifying processing domain for modules. Kranthi G (1): ASoC: Intel: Skylake: add support for tplg manifest load Ramesh Babu (2): ASoC: Intel: Skylake: Add library loading IPCs ASoC: Intel: Skylake: Add library loading support Senthilnathan Veppur (2): ASoC: Intel: Skylake: add additional args to module parsing ASoC: Intel: Skylake: Add module processing domain support Vinod Koul (7): ASoC: Intel: Skylake: Check list empty while getting module info ASoC: Intel: Skylake: Move modules query to runtime ASoC: Intel: Skylake: modify skl_get_dsp_ops() ASoC: Intel: Skylake: split fw and dsp initialization ASoC: Intel: Skylake: Parse UUIDs once ASoC: Intel: Bxt: Parse UUIDs once ASoC: Intel: Skylake: Fix a comment style sound/soc/intel/skylake/bxt-sst.c | 114 ++++++++++++++++++++++++--- sound/soc/intel/skylake/skl-messages.c | 39 +++++---- sound/soc/intel/skylake/skl-pcm.c | 20 +++++ sound/soc/intel/skylake/skl-sst-dsp.h | 7 +- sound/soc/intel/skylake/skl-sst-ipc.c | 29 +++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 12 ++- sound/soc/intel/skylake/skl-sst-utils.c | 14 +++- sound/soc/intel/skylake/skl-sst.c | 43 ++++++---- sound/soc/intel/skylake/skl-topology.c | 55 +++++++++++-- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl-tplg-interface.h | 15 +++- sound/soc/intel/skylake/skl.h | 2 + 12 files changed, 297 insertions(+), 55 deletions(-) -- 1.9.1

2 24

[alsa-devel] [PATCH 0/3] DesignWare HDMI I2S suport
by Kuninori Morimoto 05 Aug '16

05 Aug '16

Hi Mark, Thierry, Russell These are DesignWare HDMI I2S support patches. It will use ALSA SoC hdmi-codec driver, but we can't use it as-is. So, 2), 3) patches modify hdmi-codec style. Kuninori Morimoto (3): 1) drm: bridge: add DesignWare HDMI I2S audio support 2) ASoC: hdmi-codec: callback function will be called with private data 3) ASoC: hdmi-codec: enable multi probe for same device drivers/gpu/drm/bridge/Kconfig | 8 ++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-hdmi-audio.h | 7 ++ drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c | 123 +++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw-hdmi.c | 22 +++++- drivers/gpu/drm/bridge/dw-hdmi.h | 21 +++++ include/sound/hdmi-codec.h | 13 +-- sound/soc/codecs/hdmi-codec.c | 81 ++++++++++++++++--- 8 files changed, 259 insertions(+), 17 deletions(-) create mode 100644 drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c -- 1.9.1

5 16