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

[alsa-devel] [PATCH v8 0/5] Add platform clock for BayTrail platforms
by Pierre-Louis Bossart 10 Jul '17

10 Jul '17

These patches specifically enable the audio MCLK required by Baytrail CR devices. It is the remaining part of a bigger set of patches (already merged in Mark Brown's tree) that enable sound for Baytrail CR devices (especially Asus T100TAF) [1]. They include the clock driver and clock enabling in the pmc_atom code (along with moving of the non-architectural pmc_atom driver code into drivers/platform/x86 as suggested by Thomas Gleixner [2]). This move includes a new header in include/linux/platform_data/x86/. While there is an agreement that the definitions for PMC clocks are not really platform data this location is seen as a good-enough compromise with an agreement between Darren Hart and Andy Shevchenko [3] [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-August/111704.html [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-October/113936.ht… [3] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-December/115892.h… Changes from v7: - Replaced clk-readl/writel by regular readl/writel - Fixed two nitpick comments (newline and driver name string) - Fixed [5:0] to [0..5] in comment (missed in v6) Changes from v6: - Addressed comments from Stephen Boyd, Andy Shevchenko and Vinod Koul - Renamed clk-byt-plt to clk-pmc-atom - Rebase to 4.10-rc3 (broonie/for-next) - Added helper functions to make error handling more compact - Removed module-related code since it's not possible/supported - Removed useless tests on remove - PMC_CLK_OFFSET move to clk-pcm-atom (more logical) - Split typo correction and makefile fix in separate patches - small fixes (spaces, defaults in switches, alphabetical order, use of clk_writel/readl and no test on write, simpler error handling, use of while(i--), unsigned loop variables, kernel doc fields, format-patch -M -C -D, use of PLATFORM_DEVID_NONE) Changes from v5: - fix build error reported by kbuild test robot - split the clk driver code from x86 platform changes Changes from v4: - move the pmc_atom driver from arch/x86/platform/atom to drivers/platform/x86 Changes from v3: - replace devm_kzalloc with devm_kcalloc - add x86 architecture maintainers Changes from v2: - move clk platform data structures to a separate include file - store clk_hw pointer for the fixed rate clocks Changes from v1: - register the clk device as child of pmc device - pass iomem pointer from pmc driver to clk driver to avoid using pmc_atom_read()/write() and use readl/writel API instead - use devm_clk_hw_register/clkdev_hw_create instead of clk_register/clkdev_create Irina Tirdea (3): clk: x86: Add Atom PMC platform clocks arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 platform/x86: Enable Atom PMC platform clocks Pierre-Louis Bossart (2): clk: Make x86/ conditional on CONFIG_COMMON_CLK platform/x86: fix typo in comment arch/x86/Kconfig | 4 - arch/x86/platform/atom/Makefile | 1 - drivers/acpi/acpi_lpss.c | 2 +- drivers/clk/Makefile | 2 + drivers/clk/x86/Makefile | 1 + drivers/clk/x86/clk-pmc-atom.c | 371 +++++++++++++++++++++ drivers/platform/x86/Kconfig | 5 + drivers/platform/x86/Makefile | 1 + .../atom => drivers/platform/x86}/pmc_atom.c | 88 ++++- include/linux/platform_data/x86/clk-pmc-atom.h | 44 +++ .../linux/platform_data/x86}/pmc_atom.h | 2 +- 11 files changed, 506 insertions(+), 15 deletions(-) create mode 100644 drivers/clk/x86/clk-pmc-atom.c rename {arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c (87%) create mode 100644 include/linux/platform_data/x86/clk-pmc-atom.h rename {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h (98%) -- 2.7.4

4 11

[alsa-devel] [PATCH v2] ASoC: rt5514: Move the auto disable DSP function to set_bias_level()
by Oder Chiou 10 Jul '17

10 Jul '17

Move the auto disable DSP function from the widget event "DAPM Pre" to the set_bias_level() function to avoid the unexpected behavior. While the SPI was recording using the DAI "rt5514-dsp-cpu-dai", the event "DAPM Pre" would be manipulated even the DAPM widgets were not connected, and it also would power off the DSP that cause the DSP buffered data lost. So the auto disable DSP function should move to the set_bias_level() function to make sure that it is only manipulated by the DAPM widgets are connected. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5514.c | 49 +++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 1b6796c..a71e630 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -471,35 +471,6 @@ static int rt5514_is_sys_clk_from_pll(struct snd_soc_dapm_widget *source, return 0; } -static int rt5514_pre_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct rt5514_priv *rt5514 = snd_soc_codec_get_drvdata(codec); - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - /** - * If the DSP is enabled in start of recording, the DSP - * should be disabled, and sync back to normal recording - * settings to make sure recording properly. - */ - if (rt5514->dsp_enabled) { - rt5514->dsp_enabled = 0; - regmap_multi_reg_write(rt5514->i2c_regmap, - rt5514_i2c_patch, ARRAY_SIZE(rt5514_i2c_patch)); - regcache_mark_dirty(rt5514->regmap); - regcache_sync(rt5514->regmap); - } - break; - - default: - return 0; - } - - return 0; -} - static const struct snd_soc_dapm_widget rt5514_dapm_widgets[] = { /* Input Lines */ SND_SOC_DAPM_INPUT("DMIC1L"), @@ -607,8 +578,6 @@ static const struct snd_soc_dapm_widget rt5514_dapm_widgets[] = { /* Audio Interface */ SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0), - - SND_SOC_DAPM_PRE("DAPM Pre", rt5514_pre_event), }; static const struct snd_soc_dapm_route rt5514_dapm_routes[] = { @@ -975,6 +944,24 @@ static int rt5514_set_bias_level(struct snd_soc_codec *codec, } break; + case SND_SOC_BIAS_STANDBY: + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + /* + * If the DSP is enabled in start of recording, the DSP + * should be disabled, and sync back to normal recording + * settings to make sure recording properly. + */ + if (rt5514->dsp_enabled) { + rt5514->dsp_enabled = 0; + regmap_multi_reg_write(rt5514->i2c_regmap, + rt5514_i2c_patch, + ARRAY_SIZE(rt5514_i2c_patch)); + regcache_mark_dirty(rt5514->regmap); + regcache_sync(rt5514->regmap); + } + } + break; + default: break; } -- 2.7.4

1 0

[alsa-devel] [PATCH v2 0/9] add support for Sama5d2 audio PLLs and enable ClassD
by Quentin Schulz 10 Jul '17

10 Jul '17

This patch series adds support for the audio PLLs and enables ClassD that can be found in ATMEL Sama5d2 SoC. There are two audio PLLs (PMC and PAD) that shares the same parent (FRAC). FRAC can output between 620 and 700MHz and only multiply the rate of its parent. The two audio PLLs then divide the FRAC rate to best match the asked rate. I basically took an old patch series posted by Nicolas on December, 6th 2016[1][2][3] and the comments Boris did on the first version[4] Nicolas sent on July, 15th 2015. I also fixed the function used to compute the divisors, removed useless spinlocks and added a range to the audio frac PLL to stay within vendor's supported range. Clocks that are children of gclk (generated-clk) are now able to propagate rate to the audio PLL clocks when needed. However, there are multiple children clocks that could technically change the rate of audio_pll (via gck). With the rate locking introduced in Jerome Brunet's patch series[5], the first consumer to enable the clock will be the one definitely setting the rate of the clock. Without the rate locking, the last consumer to set the rate will be able to mess with the rate. Since audio IPs are most likely to request the same rate, we enforce that the only clks able to modify gck rate are those of audio IPs. To remain consistent, we deny other clocks to be children of audio_pll. Thanks, Quentin [1] https://patchwork.kernel.org/patch/9462351/ [2] https://patchwork.kernel.org/patch/9462347/ [3] https://patchwork.kernel.org/patch/9462349/ [4] https://www.spinics.net/lists/arm-kernel/msg436120.html [5] http://www.spinics.net/lists/linux-clk/msg17927.html Cyrille Pitchen (2): ARM: dts: at91: sama5d2: add classd nodes ARM: dts: at91: sama5d2_xplained: add pin muxing and enable classd Quentin Schulz (7): clk: at91: clk-generated: remove useless divisor loop clk: at91: add audio plls to the compatible list in DT binding clk: at91: add audio pll clock drivers clk: at91: clk-generated: create function to find best_diff clk: at91: clk-generated: make gclk determine audio_pll rate ASoC: atmel-classd: remove aclk clock from DT binding ASoC: atmel-classd: remove aclk clock .../devicetree/bindings/clock/at91-clock.txt | 10 + .../devicetree/bindings/sound/atmel-classd.txt | 9 +- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 16 ++ arch/arm/boot/dts/sama5d2.dtsi | 39 +++- arch/arm/mach-at91/Kconfig | 4 + drivers/clk/at91/Makefile | 2 + drivers/clk/at91/clk-audio-pll-pad.c | 206 ++++++++++++++++++ drivers/clk/at91/clk-audio-pll-pmc.c | 174 +++++++++++++++ drivers/clk/at91/clk-audio-pll.c | 239 +++++++++++++++++++++ drivers/clk/at91/clk-generated.c | 86 ++++++-- include/linux/clk/at91_pmc.h | 25 +++ sound/soc/atmel/atmel-classd.c | 47 ++-- 12 files changed, 798 insertions(+), 59 deletions(-) create mode 100644 drivers/clk/at91/clk-audio-pll-pad.c create mode 100644 drivers/clk/at91/clk-audio-pll-pmc.c create mode 100644 drivers/clk/at91/clk-audio-pll.c -- 2.11.0

6 15

[alsa-devel] [PATCH v2] ASoC: hdmi-codec: ELD control corresponds to the PCM stream
by Kuninori Morimoto 07 Jul '17

07 Jul '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current hdmi-codec driver is using hdmi_controls for "ELD" control. But, hdmi-codec driver might be used from many HDMIs. Thus, we need to correspond device number, otherwise we will receive below error. xxx: control x:x:x:ELD:x is already present This patch registers ELD control in .pcm_new by using .device = rtd->pcm->device to corresponding to PCM stream. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> [Takashi: use snd_ctl_new1()/snd_ctl_add()] Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1 -> v2 - change title - ASoC: hdmi-codec: hdmi_codec_priv includes snd_kcontrol_new + ASoC: hdmi-codec: ELD control corresponds to the PCM stream - hdmi_eld_ctl is now local variable - Author should be Takashi ? sound/soc/codecs/hdmi-codec.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 22ed0dc..7686a80 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -399,18 +399,6 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol, return 0; } - -static const struct snd_kcontrol_new hdmi_controls[] = { - { - .access = SNDRV_CTL_ELEM_ACCESS_READ | - SNDRV_CTL_ELEM_ACCESS_VOLATILE, - .iface = SNDRV_CTL_ELEM_IFACE_PCM, - .name = "ELD", - .info = hdmi_eld_ctl_info, - .get = hdmi_eld_ctl_get, - }, -}; - static int hdmi_codec_new_stream(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -668,6 +656,16 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_driver *drv = dai->driver; struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); + struct snd_kcontrol *kctl; + struct snd_kcontrol_new hdmi_eld_ctl = { + .access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "ELD", + .info = hdmi_eld_ctl_info, + .get = hdmi_eld_ctl_get, + .device = rtd->pcm->device, + }; int ret; dev_dbg(dai->dev, "%s()\n", __func__); @@ -686,7 +684,12 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, hcp->chmap_info->chmap = hdmi_codec_stereo_chmaps; hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; - return 0; + /* add ELD ctl with the device number corresponding to the PCM stream */ + kctl = snd_ctl_new1(&hdmi_eld_ctl, dai->component); + if (!kctl) + return -ENOMEM; + + return snd_ctl_add(rtd->card->snd_card, kctl); } static struct snd_soc_dai_driver hdmi_i2s_dai = { @@ -732,8 +735,6 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component, static struct snd_soc_codec_driver hdmi_codec = { .component_driver = { - .controls = hdmi_controls, - .num_controls = ARRAY_SIZE(hdmi_controls), .dapm_widgets = hdmi_widgets, .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), .dapm_routes = hdmi_routes, -- 1.9.1

4 3

[alsa-devel] [PATCH 1/3] ASoC: rt5663: Update the calibration funciton
by Oder Chiou 07 Jul '17

07 Jul '17

The patch updates the calibration funciton for getting the correct DC offset of headphone output. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5663.c | 100 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c index a33202a..18b3b52 100644 --- a/sound/soc/codecs/rt5663.c +++ b/sound/soc/codecs/rt5663.c @@ -2986,47 +2986,75 @@ static void rt5663_calibrate(struct rt5663_priv *rt5663) { int value, count; - regmap_write(rt5663->regmap, RT5663_RC_CLK, 0x0280); + regmap_write(rt5663->regmap, RT5663_RESET, 0x0000); + msleep(20); + regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_4, 0x00a1); + regmap_write(rt5663->regmap, RT5663_RC_CLK, 0x0380); regmap_write(rt5663->regmap, RT5663_GLB_CLK, 0x8000); - regmap_write(rt5663->regmap, RT5663_DIG_MISC, 0x8001); + regmap_write(rt5663->regmap, RT5663_ADDA_CLK_1, 0x1000); regmap_write(rt5663->regmap, RT5663_VREF_RECMIX, 0x0032); - regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xa2be); - msleep(20); - regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xf2be); - regmap_write(rt5663->regmap, RT5663_PWR_DIG_2, 0x8400); - regmap_write(rt5663->regmap, RT5663_CHOP_ADC, 0x3000); - regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x003b); - regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x8df8); - regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x0003); - regmap_write(rt5663->regmap, RT5663_PWR_ANLG_3, 0x018c); - regmap_write(rt5663->regmap, RT5663_ADDA_CLK_1, 0x1111); + regmap_write(rt5663->regmap, RT5663_HP_IMP_SEN_19, 0x000c); + regmap_write(rt5663->regmap, RT5663_DUMMY_1, 0x0324); + regmap_write(rt5663->regmap, RT5663_DIG_MISC, 0x8001); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xa23b); + msleep(30); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xf23b); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x8000); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_3, 0x0008); regmap_write(rt5663->regmap, RT5663_PRE_DIV_GATING_1, 0xffff); regmap_write(rt5663->regmap, RT5663_PRE_DIV_GATING_2, 0xffff); + regmap_write(rt5663->regmap, RT5663_CBJ_1, 0x8c10); + regmap_write(rt5663->regmap, RT5663_IL_CMD_2, 0x00c1); + regmap_write(rt5663->regmap, RT5663_EM_JACK_TYPE_1, 0xb880); + regmap_write(rt5663->regmap, RT5663_EM_JACK_TYPE_2, 0x4110); + regmap_write(rt5663->regmap, RT5663_EM_JACK_TYPE_2, 0x4118); + + count = 0; + while (true) { + regmap_read(rt5663->regmap, RT5663_INT_ST_2, &value); + if (!(value & 0x80)) + usleep_range(10000, 10005); + else + break; + + if (count > 200) + break; + } + + regmap_write(rt5663->regmap, RT5663_HP_IMP_SEN_19, 0x0000); regmap_write(rt5663->regmap, RT5663_DEPOP_2, 0x3003); + regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x0038); regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x003b); + regmap_write(rt5663->regmap, RT5663_PWR_DIG_2, 0x8400); + regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x8df8); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x8003); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_3, 0x018c); regmap_write(rt5663->regmap, RT5663_HP_CHARGE_PUMP_1, 0x1e32); - regmap_write(rt5663->regmap, RT5663_HP_CHARGE_PUMP_2, 0x1371); regmap_write(rt5663->regmap, RT5663_DACREF_LDO, 0x3b0b); - regmap_write(rt5663->regmap, RT5663_STO_DAC_MIXER, 0x2080); + regmap_write(rt5663->regmap, RT5663_STO_DAC_MIXER, 0x0000); regmap_write(rt5663->regmap, RT5663_BYPASS_STO_DAC, 0x000c); - regmap_write(rt5663->regmap, RT5663_HP_BIAS, 0xabba); + regmap_write(rt5663->regmap, RT5663_HP_BIAS, 0xafaa); regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_1, 0x2224); regmap_write(rt5663->regmap, RT5663_HP_OUT_EN, 0x8088); regmap_write(rt5663->regmap, RT5663_STO_DRE_9, 0x0017); regmap_write(rt5663->regmap, RT5663_STO_DRE_10, 0x0017); regmap_write(rt5663->regmap, RT5663_STO1_ADC_MIXER, 0x4040); + regmap_write(rt5663->regmap, RT5663_CHOP_ADC, 0x3000); regmap_write(rt5663->regmap, RT5663_RECMIX, 0x0005); regmap_write(rt5663->regmap, RT5663_ADDA_RST, 0xc000); regmap_write(rt5663->regmap, RT5663_STO1_HPF_ADJ1, 0x3320); regmap_write(rt5663->regmap, RT5663_HP_CALIB_2, 0x00c9); regmap_write(rt5663->regmap, RT5663_DUMMY_1, 0x004c); - regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_1, 0x7766); - regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0x4702); - msleep(200); + regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_1, 0x1111); + regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0x4402); + regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_2, 0x3311); regmap_write(rt5663->regmap, RT5663_HP_CALIB_1, 0x0069); - regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06c2); - regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x7b00); - regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xfb00); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06ce); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x6800); + regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_2, 0x1100); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_7, 0x0057); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xe800); + count = 0; while (true) { regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value); @@ -3039,6 +3067,36 @@ static void rt5663_calibrate(struct rt5663_priv *rt5663) return; count++; } + + regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x6200); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_7, 0x0059); + regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xe200); + + count = 0; + while (true) { + regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value); + if (value & 0x8000) + usleep_range(10000, 10005); + else + break; + + if (count > 200) + return; + count++; + } + + regmap_write(rt5663->regmap, RT5663_EM_JACK_TYPE_1, 0xb8e0); + usleep_range(10000, 10005); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0x003b); + usleep_range(10000, 10005); + regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x0000); + usleep_range(10000, 10005); + regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x000b); + usleep_range(10000, 10005); + regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x0008); + usleep_range(10000, 10005); + regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x0000); + usleep_range(10000, 10005); } static int rt5663_i2c_probe(struct i2c_client *i2c, -- 2.7.4

2 5

[alsa-devel] [PATCH] ASoC: spear: fix error return code in spdif_in_probe()
by Gustavo A. R. Silva 07 Jul '17

07 Jul '17

platform_get_irq() returns an error code, but the spdif_in driver ignores it and always returns -EINVAL. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… Print error message and propagate the return value of platform_get_irq on failure. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/spear/spdif_in.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 977a078..7f32527 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -223,8 +223,10 @@ static int spdif_in_probe(struct platform_device *pdev) host->io_base = io_base; host->irq = platform_get_irq(pdev, 0); - if (host->irq < 0) - return -EINVAL; + if (host->irq < 0) { + dev_warn(&pdev->dev, "failed to get IRQ: %d\n", host->irq); + return host->irq; + } host->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(host->clk)) -- 2.5.0

2 1

[alsa-devel] [PATCH] ASoC: kirkwood-i2s: fix error return code in kirkwood_i2s_dev_probe()
by Gustavo A. R. Silva 07 Jul '17

07 Jul '17

platform_get_irq() returns an error code, but the kirkwood-i2s driver ignores it and always returns -ENXIO. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error. Print and propagate the return value of platform_get_irq on failure. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/kirkwood/kirkwood-i2s.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 3a36d60..3b09f71 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -550,9 +550,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return PTR_ERR(priv->io); priv->irq = platform_get_irq(pdev, 0); - if (priv->irq <= 0) { - dev_err(&pdev->dev, "platform_get_irq failed\n"); - return -ENXIO; + if (priv->irq < 0) { + dev_err(&pdev->dev, "platform_get_irq failed: %d\n", priv->irq); + return priv->irq; } if (np) { -- 2.5.0

2 1

[alsa-devel] [PATCH] ASoC: twl6040: fix error return code in twl6040_probe()
by Gustavo A. R. Silva 07 Jul '17

07 Jul '17

platform_get_irq() returns an error code, but the twl6040 driver ignores it and always returns -EINVAL. This is not correct, and prevents -EPROBE_DEFER from being propagated properly. Notice that platform_get_irq() no longer returns 0 on error. Print and propagate the return value of platform_get_irq on failure. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/codecs/twl6040.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 2b6ad09..96cf94a 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1123,8 +1123,8 @@ static int twl6040_probe(struct snd_soc_codec *codec) priv->plug_irq = platform_get_irq(pdev, 0); if (priv->plug_irq < 0) { - dev_err(codec->dev, "invalid irq\n"); - return -EINVAL; + dev_err(codec->dev, "invalid irq: %d\n", priv->plug_irq); + return priv->plug_irq; } INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work); -- 2.5.0

2 1

[alsa-devel] [PATCH] ASoC: imx-ssi: add check on platform_get_irq return value
by Gustavo A. R. Silva 07 Jul '17

07 Jul '17

Check return value from call to platform_get_irq(), so in case of failure print error message and propagate the return value. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/fsl/imx-ssi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index b95132e..0679061 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -527,6 +527,10 @@ static int imx_ssi_probe(struct platform_device *pdev) } ssi->irq = platform_get_irq(pdev, 0); + if (ssi->irq < 0) { + dev_err(&pdev->dev, "Failed to get IRQ: %d\n", ssi->irq); + return ssi->irq; + } ssi->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(ssi->clk)) { -- 2.5.0

3 2

[alsa-devel] [PATCH] ALSA: hda/realtek - change the location for one of two front microphones
by Hui Wang 07 Jul '17

07 Jul '17

On this Lenovo machine, there are two front mics, and both of them are assigned the same name "Mic", but pulseaudio can't support two mics with the same name, as a workaround, we change the location for one of them, then the driver will assign "Front Mic" and "Mic" for them. Cc: stable(a)vger.kernel.org Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index cebf59e..a6c3ce0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5179,6 +5179,7 @@ enum { ALC233_FIXUP_ASUS_MIC_NO_PRESENCE, ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE, ALC233_FIXUP_LENOVO_MULTI_CODECS, + ALC294_FIXUP_LENOVO_MIC_LOCATION, }; static const struct hda_fixup alc269_fixups[] = { @@ -5962,6 +5963,18 @@ enum { .type = HDA_FIXUP_FUNC, .v.func = alc233_alc662_fixup_lenovo_dual_codecs, }, + [ALC294_FIXUP_LENOVO_MIC_LOCATION] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + /* Change the mic location from front to right, otherwise there are + two front mics with the same name, pulseaudio can't handle them. + This is just a temporary workaround, after applying this fixup, + there will be one "Front Mic" and one "Mic" in this machine. + */ + { 0x1a, 0x04a19040 }, + { } + }, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -6143,6 +6156,7 @@ enum { SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460), SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), + SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), -- 1.9.1

2 3

[alsa-devel] [PATCH 2/2] soc: codecs: rt5645: fixed coding style issuses
by Chris Gorman 07 Jul '17

07 Jul '17

fixed coding style issues 6 warnings and 1 error left two warnings alone because I was unsure about changing the logic and felt the 80 + character line necessary sound/soc/codecs/rt5645.c:702: WARNING: else is not generally useful after a break or return sound/soc/codecs/rt5645.c:3024: WARNING: line over 80 characters Signed-off-by: Chris Gorman <chrisjohgorman(a)bell.net> --- sound/soc/codecs/rt5645.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 87844a4..7c14317 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3021,7 +3021,7 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, switch (level) { case SND_SOC_BIAS_PREPARE: - if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) { + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) { snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2, @@ -3117,7 +3117,8 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) snd_soc_dapm_sync(dapm); if (!dapm->card->instantiated) { /* Power up necessary bits for JD if dapm is - not ready yet */ + * not ready yet + */ regmap_update_bits(rt5645->regmap, RT5645_PWR_ANLG1, RT5645_PWR_MB | RT5645_PWR_VREF2, RT5645_PWR_MB | RT5645_PWR_VREF2); @@ -3143,9 +3144,8 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) if (val == 1 || val == 2) { rt5645->jack_type = SND_JACK_HEADSET; - if (rt5645->en_button_func) { + if (rt5645->en_button_func) rt5645_enable_push_button_irq(codec, true); - } } else { snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); @@ -3262,10 +3262,11 @@ static void rt5645_jack_detect_work(struct work_struct *work) 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. */ + * 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: @@ -3527,7 +3528,7 @@ static const struct regmap_config rt5650_regmap = { }; static const struct regmap_config temp_regmap = { - .name="nocache", + .name = "nocache", .reg_bits = 8, .val_bits = 16, .use_single_rw = true, -- 2.7.4

1 0

[alsa-devel] [PATCH] ALSA: msnd: Optimize / harden DSP and MIDI loops
by Takashi Iwai 06 Jul '17

06 Jul '17

The ISA msnd drivers have loops fetching the ring-buffer head, tail and size values inside the loops. Such codes are inefficient and fragile. This patch optimizes it, and also adds the sanity check to avoid the endless loops. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196131 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196133 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/msnd/msnd_midi.c | 30 +++++++++++++++--------------- sound/isa/msnd/msnd_pinnacle.c | 23 ++++++++++++----------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c index 912b5a9ccbab..013d8d1170fe 100644 --- a/sound/isa/msnd/msnd_midi.c +++ b/sound/isa/msnd/msnd_midi.c @@ -120,24 +120,24 @@ void snd_msndmidi_input_read(void *mpuv) unsigned long flags; struct snd_msndmidi *mpu = mpuv; void *pwMIDQData = mpu->dev->mappedbase + MIDQ_DATA_BUFF; + u16 head, tail, size; spin_lock_irqsave(&mpu->input_lock, flags); - while (readw(mpu->dev->MIDQ + JQS_wTail) != - readw(mpu->dev->MIDQ + JQS_wHead)) { - u16 wTmp, val; - val = readw(pwMIDQData + 2 * readw(mpu->dev->MIDQ + JQS_wHead)); - - if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER, - &mpu->mode)) - snd_rawmidi_receive(mpu->substream_input, - (unsigned char *)&val, 1); - - wTmp = readw(mpu->dev->MIDQ + JQS_wHead) + 1; - if (wTmp > readw(mpu->dev->MIDQ + JQS_wSize)) - writew(0, mpu->dev->MIDQ + JQS_wHead); - else - writew(wTmp, mpu->dev->MIDQ + JQS_wHead); + head = readw(mpu->dev->MIDQ + JQS_wHead); + tail = readw(mpu->dev->MIDQ + JQS_wTail); + size = readw(mpu->dev->MIDQ + JQS_wSize); + if (head > size || tail > size) + goto out; + while (head != tail) { + unsigned char val = readw(pwMIDQData + 2 * head); + + if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER, &mpu->mode)) + snd_rawmidi_receive(mpu->substream_input, &val, 1); + if (++head > size) + head = 0; + writew(head, mpu->dev->MIDQ + JQS_wHead); } + out: spin_unlock_irqrestore(&mpu->input_lock, flags); } EXPORT_SYMBOL(snd_msndmidi_input_read); diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index ad4897337df5..fc4fb1904aef 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -170,23 +170,24 @@ static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id) { struct snd_msnd *chip = dev_id; void *pwDSPQData = chip->mappedbase + DSPQ_DATA_BUFF; + u16 head, tail, size; /* Send ack to DSP */ /* inb(chip->io + HP_RXL); */ /* Evaluate queued DSP messages */ - while (readw(chip->DSPQ + JQS_wTail) != readw(chip->DSPQ + JQS_wHead)) { - u16 wTmp; - - snd_msnd_eval_dsp_msg(chip, - readw(pwDSPQData + 2 * readw(chip->DSPQ + JQS_wHead))); - - wTmp = readw(chip->DSPQ + JQS_wHead) + 1; - if (wTmp > readw(chip->DSPQ + JQS_wSize)) - writew(0, chip->DSPQ + JQS_wHead); - else - writew(wTmp, chip->DSPQ + JQS_wHead); + head = readw(chip->DSPQ + JQS_wHead); + tail = readw(chip->DSPQ + JQS_wTail); + size = readw(chip->DSPQ + JQS_wSize); + if (head > size || tail > size) + goto out; + while (head != tail) { + snd_msnd_eval_dsp_msg(chip, readw(pwDSPQData + 2 * head)); + if (++head > size) + head = 0; + writew(head, chip->DSPQ + JQS_wHead); } + out: /* Send ack to DSP */ inb(chip->io + HP_RXL); return IRQ_HANDLED; -- 2.13.2

1 0

[alsa-devel] A problem about two microphones
by Hui Wang 06 Jul '17

06 Jul '17

Recently we met a problem, on a lenovo machine, it has two microphones(one is microphone, the other is headset-mic), and both of them are located in the front panel. When the driver assigns names for them (via the function hda_get_autocfg_input_label()), they are assigned the same name "Mic" since they have the same location. So there are two "Mic", but the pulseaudio can't handle two "Mic", in the pulseaudio, it can only handle multiple inputs/microphones with different names, like "Mic" and "Front Mic". If two microphones have the same name, we can only see one of them through pulseaudio. I don't know how to solve this problem, the simplest way to workaround it I can figure out is to change one of the microphone's location, let them have differnt location, then they have differnet names. Pin Default 0x02a19040: [Jack] Mic at Ext Front Changed to: Pin Default 0x04a19040: [Jack] Mic at Ext Right Do you have any ideas to solve this problem? The alsa-info.txt for this machine is at: http://paste.ubuntu.com/24967758/ Thanks, Hui.

2 2

[alsa-devel] [PATCH 00/18] treewide: Move storage class before return type
by Joe Perches 06 Jul '17

06 Jul '17

Move the inline/asmlinkage keywords before the return types Add a checkpatch test for this too. Joe Perches (18): checkpatch: improve the STORAGE_CLASS test ARM: KVM: Move asmlinkage before type ARM: HP Jornada 7XX: Move inline before return type CRIS: gpio: Move inline before return type FRV: tlbflush: Move asmlinkage before return type ia64: Move inline before return type ia64: sn: pci: Move inline before type m68k: coldfire: Move inline before return type MIPS: SMP: Move asmlinkage before return type sh: Move inline before return type x86/efi: Move asmlinkage before return type drivers: s390: Move static and inline before return type drivers: tty: serial: Move inline before return type USB: serial: safe_serial: Move __inline__ before return type video: fbdev: intelfb: Move inline before return type video: fbdev: omap: Move inline before return type ARM: samsung: usb-ohci: Move inline before return type ALSA: opl4: Move inline before return type arch/arm/include/asm/kvm_hyp.h | 8 ++++---- arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- arch/cris/arch-v10/drivers/gpio.c | 4 ++-- arch/frv/include/asm/tlbflush.h | 8 ++++---- arch/ia64/kernel/mca.c | 2 +- arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 +- arch/ia64/sn/pci/tioce_provider.c | 4 ++-- arch/m68k/coldfire/intc-simr.c | 4 ++-- arch/mips/include/asm/smp.h | 2 +- arch/sh/mm/cache-sh5.c | 2 +- arch/x86/include/asm/efi.h | 4 ++-- drivers/s390/net/ctcm_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/tty/serial/ioc3_serial.c | 4 ++-- drivers/tty/serial/ioc4_serial.c | 4 ++-- drivers/usb/serial/safe_serial.c | 2 +- drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- drivers/video/fbdev/omap/lcdc.c | 6 +++--- include/linux/platform_data/usb-ohci-s3c2410.h | 2 +- scripts/checkpatch.pl | 12 ++++++++++-- sound/drivers/opl4/opl4_lib.c | 2 +- 21 files changed, 44 insertions(+), 36 deletions(-) -- 2.10.0.rc2.1.g053435c

3 3

[alsa-devel] [PATCH 0/3] mfd: move include files out of include/linux/i2c
by Wolfram Sang 06 Jul '17

06 Jul '17

It doesn't make sense to use include/linux/i2c for client drivers which may in fact rather be hwmon or input or whatever devices. As a result, I want to deprecate include/linux/i2c for good. This series moves the include files to a better location, for the mfd subsystem to include/linux/mfd. Because of twl.h, this touches quite some subsystems, but I still think it is worth it. I prefer the series to go upstream via the subsystem tree; if you prefer that I take it via I2C, just let me know. No runtime testing because of no HW, but buildbot is happy with this series at least. A branch can be found here: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/platform_data Thanks and kind regards, Wolfram Wolfram Sang (3): mfd: dm355evm_msp: move header file out of I2C realm mfd: tps65010: move header file out of I2C realm mfd: twl: move header file out of I2C realm arch/arm/mach-omap1/board-h2-mmc.c | 2 +- arch/arm/mach-omap1/board-h2.c | 2 +- arch/arm/mach-omap1/board-h3-mmc.c | 2 +- arch/arm/mach-omap1/board-h3.c | 2 +- arch/arm/mach-omap1/board-osk.c | 2 +- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/omap_twl.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- drivers/gpio/gpio-twl4030.c | 2 +- drivers/iio/adc/twl4030-madc.c | 2 +- drivers/iio/adc/twl6030-gpadc.c | 2 +- drivers/input/keyboard/twl4030_keypad.c | 2 +- drivers/input/misc/dm355evm_keys.c | 2 +- drivers/input/misc/twl4030-pwrbutton.c | 2 +- drivers/input/misc/twl4030-vibra.c | 2 +- drivers/mfd/dm355evm_msp.c | 2 +- drivers/mfd/tps65010.c | 2 +- drivers/mfd/twl-core.c | 6 +++--- drivers/mfd/twl4030-audio.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/twl4030-power.c | 2 +- drivers/mfd/twl6030-irq.c | 2 +- drivers/phy/phy-twl4030-usb.c | 2 +- drivers/power/supply/twl4030_charger.c | 2 +- drivers/pwm/pwm-twl-led.c | 2 +- drivers/pwm/pwm-twl.c | 2 +- drivers/regulator/twl-regulator.c | 2 +- drivers/regulator/twl6030-regulator.c | 2 +- drivers/rtc/rtc-dm355evm.c | 2 +- drivers/rtc/rtc-twl.c | 2 +- drivers/usb/host/ohci-omap.c | 2 +- drivers/usb/phy/phy-isp1301-omap.c | 2 +- drivers/usb/phy/phy-twl6030-usb.c | 2 +- drivers/video/backlight/pandora_bl.c | 2 +- drivers/video/fbdev/omap/lcd_h3.c | 2 +- drivers/watchdog/twl4030_wdt.c | 2 +- include/linux/{i2c => mfd}/dm355evm_msp.h | 0 include/linux/{i2c => mfd}/tps65010.h | 2 +- include/linux/{i2c => mfd}/twl.h | 0 sound/soc/codecs/twl4030.c | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%) rename include/linux/{i2c => mfd}/tps65010.h (99%) rename include/linux/{i2c => mfd}/twl.h (100%) -- 2.11.0

11 15

[alsa-devel] [PATCH 0/3] ASoC: Add I2S support for Allwinner H3 SoCs
by codekipper＠gmail.com 06 Jul '17

06 Jul '17

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, please find attached a series of patches to bring i2s support to the Allwinner H3 SoC. This has been tested with the following setups: A20 Olimex EVB connected to a pcm5102 Orange Pi 2 connected to a uda1380 Orange Pi 2 hdmi audio playback Pine 64 connected to the audio DAC board To get i2s working some additional patches are required which will be delivered later. For now they have been pushed here https://github.com/codekipper/linux-sunxi/commits/sunxi-audio-h3 Thanks in advance, CK Marcus Cooper (3): ASoC: sun4i-i2s: Add more quirks for newer SoCs ASoC: sun4i-i2s: Get startup to call set_fmt ASoC: sun4i-i2s: Add support for H3 .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + sound/soc/sunxi/sun4i-i2s.c | 391 ++++++++++++++++++++- 2 files changed, 376 insertions(+), 17 deletions(-) -- 2.13.2

4 7

[alsa-devel] [PATCH] ASoC: hdmi-codec: hdmi_codec_priv includes snd_kcontrol_new
by Kuninori Morimoto 06 Jul '17

06 Jul '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current hdmi-codec driver is using hdmi_controls for "ELD" control. But, hdmi-codec driver might be used from many HDMIs. In such case, they will use same "ELD" name and kernel will indicate below error. xxx: control x:x:x:ELD:x is already present hdmi_controls will be registered in soc_probe_component(), and we can replace it by component driver probe function. This patch registers current hdmi_controls in new hdmi_probe(). If hdmi-codec is used from only 1 device, it will use "ELD" as control name (We can keep compatibility). If hdmi-codec is used from many devices, it will use "ELD.x" as control name. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/hdmi-codec.c | 60 +++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 22ed0dc..5835a90 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -276,6 +276,7 @@ struct hdmi_codec_cea_spk_alloc { .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC }, }; +#define ELD_NAME_SIZE 8 struct hdmi_codec_priv { struct hdmi_codec_pdata hcd; struct snd_soc_dai_driver *daidrv; @@ -284,7 +285,10 @@ struct hdmi_codec_priv { struct snd_pcm_substream *current_stream; uint8_t eld[MAX_ELD_BYTES]; struct snd_pcm_chmap *chmap_info; + struct snd_kcontrol_new control; unsigned int chmap_idx; + int id; + char eld_name[ELD_NAME_SIZE]; }; static const struct snd_soc_dapm_widget hdmi_widgets[] = { @@ -399,18 +403,6 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol, return 0; } - -static const struct snd_kcontrol_new hdmi_controls[] = { - { - .access = SNDRV_CTL_ELEM_ACCESS_READ | - SNDRV_CTL_ELEM_ACCESS_VOLATILE, - .iface = SNDRV_CTL_ELEM_IFACE_PCM, - .name = "ELD", - .info = hdmi_eld_ctl_info, - .get = hdmi_eld_ctl_get, - }, -}; - static int hdmi_codec_new_stream(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -718,6 +710,45 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, .pcm_new = hdmi_codec_pcm_new, }; +static int hdmi_last_id = 0; +static int hdmi_probe(struct snd_soc_component *component) +{ + struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component); + static struct snd_soc_component *component_1st = NULL; + char *name = "ELD"; + + /* + * It will use "ELD" if hdmi_codec was used from only 1 device. + * It will use "ELD.x" if hdmi_codec was used from many devices. + * Then, first "ELD" will be replaced to "ELD.0" + */ + snprintf(hcp->eld_name, ELD_NAME_SIZE, "ELD.%d", hcp->id); + + if (hcp->id == 0) + component_1st = component; + + if (hdmi_last_id > 1) { + name = hcp->eld_name; + + if (component_1st) { + struct hdmi_codec_priv *hcp_1st; + + /* replaced 1st "ELD" to "ELD.0" */ + hcp_1st = snd_soc_component_get_drvdata(component_1st); + hcp_1st->control.name = hcp_1st->eld_name; + } + } + + hcp->control.access = SNDRV_CTL_ELEM_ACCESS_READ | + SNDRV_CTL_ELEM_ACCESS_VOLATILE; + hcp->control.iface = SNDRV_CTL_ELEM_IFACE_PCM; + hcp->control.name = name; + hcp->control.info = hdmi_eld_ctl_info; + hcp->control.get = hdmi_eld_ctl_get; + + return snd_soc_add_component_controls(component, &hcp->control, 1); +} + static int hdmi_of_xlate_dai_id(struct snd_soc_component *component, struct device_node *endpoint) { @@ -732,8 +763,7 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component, static struct snd_soc_codec_driver hdmi_codec = { .component_driver = { - .controls = hdmi_controls, - .num_controls = ARRAY_SIZE(hdmi_controls), + .probe = hdmi_probe, .dapm_widgets = hdmi_widgets, .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), .dapm_routes = hdmi_routes, @@ -768,6 +798,7 @@ static int hdmi_codec_probe(struct platform_device *pdev) if (!hcp) return -ENOMEM; + hcp->id = hdmi_last_id; hcp->hcd = *hcd; mutex_init(&hcp->current_stream_lock); @@ -795,6 +826,7 @@ static int hdmi_codec_probe(struct platform_device *pdev) } dev_set_drvdata(dev, hcp); + hdmi_last_id++; return 0; } -- 1.9.1

3 4

[alsa-devel] [RFC PATCH] aplay: Add samples argument for playing/recording a given number of samples
by Ion-Horia Petrisor 05 Jul '17

05 Jul '17

-s --samples allows aplay to be used for playback/capture a given numbeer of samplese by channel Signed-off-by: Ion-Horia Petrisor <ion-horia.petrisor(a)nxp.com> --- This is just an RFC, we need to clarify the aplay raw format bug from: http://mailman.alsa-project.org/pipermail/alsa-devel/2017-July/122509.html aplay/aplay.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index 00af662..6ee0866 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -100,6 +100,7 @@ static struct { unsigned int rate; } hwparams, rhwparams; static int timelimit = 0; +static int sampleslimit = 0; static int quiet_mode = 0; static int file_type = FORMAT_DEFAULT; static int open_mode = 0; @@ -212,6 +213,7 @@ _("Usage: %s [OPTION]... [FILE]...\n" "-f, --format=FORMAT sample format (case insensitive)\n" "-r, --rate=# sample rate\n" "-d, --duration=# interrupt after # seconds\n" +"-s, --samples=# interrupt after # samples per channel\n" "-M, --mmap mmap stream\n" "-N, --nonblock nonblocking mode\n" "-F, --period-time=# distance between interrupts is # microseconds\n" @@ -466,8 +468,9 @@ static long parse_long(const char *str, int *err) int main(int argc, char *argv[]) { + int duration_or_sample = 0; int option_index; - static const char short_options[] = "hnlLD:qt:c:f:r:d:MNF:A:R:T:B:vV:IPCi" + static const char short_options[] = "hnlLD:qt:c:f:r:d:s:MNF:A:R:T:B:vV:IPCi" #ifdef CONFIG_SUPPORT_CHMAP "m:" #endif @@ -485,6 +488,7 @@ int main(int argc, char *argv[]) {"format", 1, 0, 'f'}, {"rate", 1, 0, 'r'}, {"duration", 1, 0 ,'d'}, + {"samples", 1, 0, 's'}, {"mmap", 0, 0, 'M'}, {"nonblock", 0, 0, 'N'}, {"period-time", 1, 0, 'F'}, @@ -640,11 +644,28 @@ int main(int argc, char *argv[]) } break; case 'd': + if (duration_or_sample) { + error(_("duration argument '%s' and samples argument cannot be used together"), optarg); + return 1; + } timelimit = parse_long(optarg, &err); if (err < 0) { error(_("invalid duration argument '%s'"), optarg); return 1; } + duration_or_sample = 1; + break; + case 's': + if (duration_or_sample) { + error(_("samples argument '%s' and duration argument cannot be used together"), optarg); + return 1; + } + sampleslimit = parse_long(optarg, &err); + if (err < 0) { + error(_("invalid samples argument '%s'"), optarg); + return 1; + } + duration_or_sample = 1; break; case 'N': nonblock = 1; @@ -2477,9 +2498,12 @@ static off64_t calc_count(void) { off64_t count; - if (timelimit == 0) { - count = pbrec_count; - } else { + if (timelimit == 0) + if (sampleslimit == 0) + count = pbrec_count; + else + count = snd_pcm_format_size(hwparams.format, sampleslimit * hwparams.channels); + else { count = snd_pcm_format_size(hwparams.format, hwparams.rate * hwparams.channels); count *= (off64_t)timelimit; } @@ -3125,7 +3149,7 @@ static void capture(char *orig_name) /* repeat the loop when format is raw without timelimit or * requested counts of data are recorded */ - } while ((file_type == FORMAT_RAW && !timelimit) || count > 0); + } while (((file_type == FORMAT_RAW && !timelimit) && !sampleslimit) || count > 0); } static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names) -- 2.7.4

1 0

[alsa-devel] [PATCH] ASoC: samsung: i2s: Supported high resolution rates
by Jaechul Lee 05 Jul '17

05 Jul '17

This driver can support more frequencies over 96KHz. There are no reasons to limit the frequency range below 96KHz. If codecs/amps or something else can't support high resolution rates, the constraints would be set rates properly because each drivers have its own limits. Signed-off-by: Jaechul Lee <jcsing.lee(a)samsung.com> --- sound/soc/samsung/i2s.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index af3ba4d4ccc5..fc34af6a2c1e 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -50,6 +50,7 @@ struct samsung_i2s_variant_regs { struct samsung_i2s_dai_data { u32 quirks; + unsigned int rates; const struct samsung_i2s_variant_regs *i2s_variant_regs; }; @@ -1076,20 +1077,25 @@ static const struct snd_soc_component_driver samsung_i2s_component = { .name = "samsung-i2s", }; -#define SAMSUNG_I2S_RATES SNDRV_PCM_RATE_8000_96000 - #define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_LE) static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) { + const struct samsung_i2s_dai_data *i2s_dai_data; struct i2s_dai *i2s; i2s = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dai), GFP_KERNEL); if (i2s == NULL) return NULL; + if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) + i2s_dai_data = of_device_get_match_data(&pdev->dev); + else + i2s_dai_data = (struct samsung_i2s_dai_data *) + platform_get_device_id(pdev)->driver_data; + i2s->pdev = pdev; i2s->pri_dai = NULL; i2s->sec_dai = NULL; @@ -1101,13 +1107,13 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) i2s->i2s_dai_drv.resume = i2s_resume; i2s->i2s_dai_drv.playback.channels_min = 1; i2s->i2s_dai_drv.playback.channels_max = 2; - i2s->i2s_dai_drv.playback.rates = SAMSUNG_I2S_RATES; + i2s->i2s_dai_drv.playback.rates = i2s_dai_data->rates; i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS; if (!sec) { i2s->i2s_dai_drv.capture.channels_min = 1; i2s->i2s_dai_drv.capture.channels_max = 2; - i2s->i2s_dai_drv.capture.rates = SAMSUNG_I2S_RATES; + i2s->i2s_dai_drv.capture.rates = i2s_dai_data->rates; i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS; } return i2s; @@ -1452,29 +1458,34 @@ static const struct samsung_i2s_variant_regs i2sv5_i2s1_regs = { static const struct samsung_i2s_dai_data i2sv3_dai_type = { .quirks = QUIRK_NO_MUXPSR, + .rates = SNDRV_PCM_RATE_8000_96000, .i2s_variant_regs = &i2sv3_regs, }; static const struct samsung_i2s_dai_data i2sv5_dai_type = { .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR | QUIRK_SUPPORTS_IDMA, + .rates = SNDRV_PCM_RATE_8000_96000, .i2s_variant_regs = &i2sv3_regs, }; static const struct samsung_i2s_dai_data i2sv6_dai_type = { .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR | QUIRK_SUPPORTS_TDM | QUIRK_SUPPORTS_IDMA, + .rates = SNDRV_PCM_RATE_8000_96000, .i2s_variant_regs = &i2sv6_regs, }; static const struct samsung_i2s_dai_data i2sv7_dai_type = { .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR | QUIRK_SUPPORTS_TDM, + .rates = SNDRV_PCM_RATE_8000_192000, .i2s_variant_regs = &i2sv7_regs, }; static const struct samsung_i2s_dai_data i2sv5_dai_type_i2s1 = { .quirks = QUIRK_PRI_6CHAN | QUIRK_NEED_RSTCLR, + .rates = SNDRV_PCM_RATE_8000_96000, .i2s_variant_regs = &i2sv5_i2s1_regs, }; -- 2.11.0

4 4

[alsa-devel] ioctl(fd, SNDRV_CTL_IOCTL_ELEM_REPLACE, ... not working from userspace ?
by Fulup Ar Foll 04 Jul '17

04 Jul '17

Hi, I try to rename existing sound control from userspace. The goal is to create a generic abstraction layer for AutomotiveGradeLinux audio server While I found two hidden methods to access to low level functionalities from user space, non of them seems to accecp replace call. I isolated the code in two basic samples https://github.com/fulup-bzh/alsa-ctl-replace - First one uses a directt IOTCL model - Second one leverage private sndctl control handle. Any idea would be more than welcome. Fulup

3 4

[alsa-devel] [PATCH] ALSA: hda - Fix unbalance of i915 module refcount
by Takashi Iwai 04 Jul '17

04 Jul '17

The commit dba9b7b6ca1a ("ALSA: hda - Fix doubly initialization of i915 component") contained a typo that leads to the unbalance of i915 module reference. The value to be checked is not chip->driver_type but chip->driver_caps. Fixes: dba9b7b6ca1a ("ALSA: hda - Fix doubly initialization of i915 component") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196219 Reported-by: Martin Peres <martin.peres(a)free.fr> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 03e34edc8f24..5ae8ddab6412 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1385,7 +1385,7 @@ static int azx_free(struct azx *chip) if (hda->need_i915_power) snd_hdac_display_power(bus, false); } - if (chip->driver_type & AZX_DCAPS_I915_COMPONENT) + if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) snd_hdac_i915_exit(bus); kfree(hda); -- 2.13.2

1 0

[alsa-devel] [GIT PULL] ASoC updates for v4.13
by Mark Brown 04 Jul '17

04 Jul '17

The following changes since commit 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c: Linux 4.12 (2017-07-02 16:07:02 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.13 for you to fetch changes up to b821d298f8864dc3c3d42643812df43289159507: Merge remote-tracking branch 'asoc/topic/inte' into asoc-next (2017-07-03 16:51:38 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.13 The big news with this release is the of-graph card, this provides a replacement for simple-card that is much more flexibile and scalable, allowing many more systems to use a generic sound card than was possible before: - The of-graph card, finally merged after a long and dedicated effort by Morimoto-san. - New widget types intended mainly for use with DSPs. - New drivers for Allwinner V3s SoCs, Ensonic ES8316, several classes of x86 machine, Rockchip PDM controllers, STM32 I2S and S/PDIF controllers and ZTE AUD96P22 CODECs. ---------------------------------------------------------------- Adam Thomson (4): ASoC: da7213: Update driver to use device_property* FW functions ASoC: da7218: Fix incorrect usage of bitwise '&' operator for SRM check ASoC: da7219: Fix HP detection procedure for all MCLK frequencies ASoC: Intel: bxt: Move codec sysclk config to codec_init function Andy Shevchenko (5): ASoC: omap-mcbsp: Use sysfs_match_string() helper ASoC: Intel: byt-max98090: Add GPIO ACPI mapping table ASoC: rt5677: Introduce proper table for ACPI enumeration ASoC: rt5677: Move platform code to board file ASoC: Intel: bdw-rt5677: Switch to devm_acpi_dev_add_driver_gpios() Arnd Bergmann (3): ASoC: rt5514: fix gcc-7 warning ASoC: rt5665: fix gcc-7 warning ASoC: es8316: add I2C dependency Arvind Yadav (1): ASoC: rsnd: constify dev_pm_ops structures. Axel Lin (1): ASoC: ak4613: Fix out of bounds array access for ak4613_iface Baoyou Xie (2): ASoC: add bindings for ZTE zx-aud96p22 audio codec ASoC: zx_aud96p22: add ZTE ZX AUD96P22 codec driver Bard Liao (11): ASoC: rt5665: add ADC STO2 ASRC support ASoC: rt5645: read jd1_1 status for jd detection ASoC: rt5645: rename jd_invert flag in platform data ASoC: rt5645: add inv_jd1_1 flag ASoC: rt5670: fix wrong audio route ASoC: rt5670: remove duplicate route. ASoC: rt5670: move set_sysclk to codec level ASoC: rt5651: remove unexisting Muxes ASoC: rt5645: enable speaker protection features ASoC: rt5670: fix incompatible pointer type of set_sysclk ASoC: rt5665: calibration should be done before jack detection Brian Austin (2): ASoC: cs35l35: Add Boost Inductor Calculation ASoC: cs35l35: Add DT handling for Inductor Charles Keepax (3): ASoC: cs35l35: Correctly handle 0 for bst_ipk ASoC: cs4271: Remove unnecessary additional variable definition ASoC: cs35l35: Add additional delay for reset Christophe Jaillet (1): ASoC: rockchip: Fix an error handling in 'rockchip_i2s_probe' Colin Ian King (6): ASoC: Intel: sst: fix spelling mistake: "allocationf" -> "allocation" ASoC: hdmi-codec: fix spelling mistake: "deteced" -> "detected" ASoC: audio-graph-card: fix spelling mistake: "missmatch" -> "mismatch" ASoC: max9867: make array ni_div static const ASoC: ak4642: make arrays fs_list and ps_list static const ASoC: rsnd: make arrays path and cmd_case static const Dan Carpenter (1): ASoC: stm32: sai: remove some stray tabs Daniel Drake (2): ASoC: add es8316 codec driver ASoC: Intel: add machine driver for BYT/CHT + ES8316 Dharageswari R (3): ASoC: Intel: Skylake: Add mic-select module type ASoC: Intel: Skylake: Add enum control for mic selection ASoC: Intel: Boards: Add 4-channel DMIC fixup. Douglas Anderson (1): ASoC: Intel: sst: Delete sst_shim_regs64; saved regs are never used Geert Uytterhoeven (3): ASoC: rt5665: Fix uninitialized warning in rt5665_i2s_pin_event() ASoC: fsi: Move inline fsi_stream_is_play() before use ASoC: rsnd: Document optional reset properties Guneshwor Singh (1): ASoC: Intel: Skylake: Add sram address to sst_addr structure Hans de Goede (1): ASoC: rt5645: del btn_check_timer on remove Harsha Priya N (3): ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927 ASoC: Intel: Convert all sst_codecs data definition to c99 style ASoC: Intel: Add Kabylake RT5663+RT5514+MAX98927 machine driver entry Icenowy Zheng (4): ASoC: sun8i-codec-analog: split out mbias ASoC: sun8i-codec-analog: prepare a mixer control/widget/route set for V3s ASoC: sun8i-codec-analog: add support for V3s SoC ASoC: sun4i-codec: Add support for V3s codec John Hsu (6): ASoC: nau8824: TDM support ASoC: nau8825: default value for property ASoC: nau8825: fix jack type detection issue after resume ASoC: nau8825: make crosstalk function optional ASoC: nau8825: debug message of crosstalk bypass ASoC: nau8825: change crosstalk-bypass property to bool type John Stultz (1): drm: adv7511_audio: Add .get_dai_id callback to map port number to dai id Julian Scheel (1): ASoC: simple-card: Fix misleading error message Kuninori Morimoto (83): ASoC: ak4613: disable asymmetric audio interface format of-graph: export symbol of_phandle_iterator_init/next of_graph: add of_graph_get_remote_endpoint() of_graph: add of_graph_get_port_parent() of_graph: add of_graph_get_endpoint_count() ASoC: soc-core: enable "dai-format" on snd_soc_of_parse_daifmt() ASoC: simple-card-utils: enable "label" on asoc_simple_card_parse_card_name ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() ASoC: add audio-graph-card document ASoC: add audio-graph-card support ASoC: rsnd: move "renesas,rsrc-card" to "simple-scu-audio-card" on Document ASoC: rsnd: add missing clocks/clock-names on Document ASoC: rsnd: remove un-used OUF_SRCO/I macro ASoC: rsnd: remove mismatch explain comment from src.c ASoC: rsnd: clkout-lr-asynchronous is AUDIO_CLKOUT related property ASoC: rsnd: remove error pointer for adg->clkout[i] ASoC: rsnd: need to call nolock_stop if nolock_start was failed ASoC: rsnd: check src mod pointer for rsnd_mod_id() ASoC: simple-card: tidyup return method from probe() ASoC: simple-scu-card: tidyup return method from probe() ASoC: audio-graph-card: tidyup return method from probe() ASoC: simple-scu-card: cleanup documentation ASoC: rsnd: add support graph base DT phase 1 ASoC: rsnd: add support graph base DT phase 2 ASoC: rsnd: add HDMI output support ASoC: add snd_soc_get_dai_id() function ASoC: simple-card-utils: support snd_soc_get_dai_id() ASoC: hdmi-codec: remove multi detection support ASoC: hdmi-codec: add .get_dai_id support ASoC: simple-card-utils: remove strict limitation of bit/frame master ASoC: add audio-graph-scu-card document ASoC: add audio-graph-scu-card support ASoC: audio-graph-scu-card: tidyup return method from probe() ASoC: rsnd: remove unused rsnd_ssi_non_ops ASoC: rsnd: remove unused rsnd_dai_path_info ASoC: simple-scu-card: tidyup "Sampling Rate Conversion" ASoC: audio-graph-scu-card: add missing MIX binding example ASoC: simple-card-utils: share same dev_dbg() for Card Name ASoC: simple-card-utils: share same dev_dbg() for DAI format ASoC: simple-card-utils: share same dev_dbg() for Dai Name ASoC: simple-card-utils: share same dev_dbg() for sysclk ASoC: hdmi-codec: remove unused ratec ASoC: simple-card: remove duplicate parameter from asoc_simple_card_parse_of() ASoC: simple-scu-card: remove duplicate paramera from asoc_simple_card_parse_of ASoC: rsnd: update pointer more accurate ASoC: rsnd: cleanup pointer related code ASoC: rsnd: don't call free_irq() on Parent SSI ASoC: rsnd: add detail explanation of L/R conversion timing ASoC: rsnd: control kctrl items acceptance anytime/runtime ASoC: simple_card_utils: add asoc_simple_card_clk_xxx() ASoC: simple-card: use asoc_simple_card_clk_xxx() ASoC: simple-scu-card: use asoc_simple_card_clk_xxx() ASoC: audio-graph-scu-card: use asoc_simple_card_clk_xxx() ASoC: audio-graph-card: use asoc_simple_card_clk_xxx() ASoC: simple_card_utils: add EXPORT_SYMBOL_GPL() for asoc_simple_card_clk_xxx() ASoC: rsnd: reduce confusable macro parameter magic ASoC: ak4613: add missing 64000 in ak4613_dai_hw_params() ASoC: simple-card-utils: add asoc_simple_card_of_parse_tdm() ASoC: simple-card: use asoc_simple_card_of_parse_tdm() ASoC: simple-scu-card: use asoc_simple_card_of_parse_tdm() ASoC: audio-graph-card: use asoc_simple_card_of_parse_tdm() ASoC: audio-graph-scu-card: use asoc_simple_card_of_parse_tdm() ASoC: simple-card-utils: add asoc_simple_card_convert_fixup() ASoC: simple-scu-card: use asoc_simple_card_convert_fixup() ASoC: audio-graph-scu-card: use asoc_simple_card_convert_fixup() ASoC: simple-card-utils: add asoc_simple_card_of_parse_routing() ASoC: simple-card: use asoc_simple_card_of_parse_routing() ASoC: simple-scu-card: use asoc_simple_card_of_parse_routing() ASoC: audio-graph-scu-card: use asoc_simple_card_of_parse_routing() ASoC: rsnd: rename "slots" related variable ASoC: rsnd: add rsnd_adg_clk_query() ASoC: rsnd: add rsnd_ssi_clk_query() ASoC: rsnd: add rsnd_soc_hw_rule/constraint() ASoC: ak4613: add hw_constraint rule for Sampling Rate ASoC: simple-card-utils: add asoc_simple_card_of_parse_widgets() ASoC: simple-card: use asoc_simple_card_of_parse_widgets() ASoC: fsl: mpc5200_dma: remove unused psc_dma ASoC: pxa: add COMPILE_TEST on SND_PXA2XX_SOC ASoC: rsnd: fixup unsigned expression compared with zero: main_rate ASoC: audio-graph-card: tidyup asoc_simple_card_canonicalize_cpu() parameter ASoC: audio-graph-scu-card: tidyup asoc_simple_card_canonicalize_cpu() parameter ASoC: audio-graph-scu-card: support 2nd codec endpoint on DT drm: dw-hdmi-i2s: add .get_dai_id callback for ALSA SoC Liam Girdwood (8): ASoC: topology: Allow bespoke configuration post widget creation ASoC: topology: rephrase deferred binding warning. ASoC: topology: Dont free template strings whilst they are in use. ASoC: topology: Fix potential build issues with undeclared structs ASoC: topology: Allow bespoke configuration post widget creation ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load ASoC: topology: show index in debug when adding DAPM routes ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs. Mark Brown (37): Merge branch 'topic/dai-id' of git://git.kernel.org/.../broonie/sound into asoc-of-graph Merge branch 'topic/of-graph' of git://git.kernel.org/.../broonie/sound into asoc-hdmi Merge branch 'topic/of-graph' of git://git.kernel.org/.../broonie/sound into asoc-rcar Merge branch 'fix/rcar' of git://git.kernel.org/.../broonie/sound into asoc-rcar ASoC: Back out post commit widget creation changes Merge branch 'topic/simple' of git://git.kernel.org/.../broonie/sound into asoc-of-graph Merge branch 'topic/rcar' of git://git.kernel.org/.../broonie/sound into asoc-of-graph ASoC: rockchip: Fix build Merge branch 'topic/rt5677' of git://git.kernel.org/.../broonie/sound into asoc-intel Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/cs35l35' and 'asoc/fix/da7219' into asoc-linus Merge remote-tracking branches 'asoc/fix/rockchip', 'asoc/fix/rt5645', 'asoc/fix/rt5663', 'asoc/fix/rt5670' and 'asoc/fix/zte' into asoc-linus 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/rcar' into asoc-next Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/ak4642', 'asoc/topic/atmel', 'asoc/topic/cs35l34' and 'asoc/topic/cs35l35' into asoc-next Merge remote-tracking branches 'asoc/topic/cs4271', 'asoc/topic/cs53l30', 'asoc/topic/da7213' and 'asoc/topic/da7218' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/drm', 'asoc/topic/dwc' and 'asoc/topic/es8316' into asoc-next Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/hisi' and 'asoc/topic/max9867' into asoc-next Merge remote-tracking branches 'asoc/topic/msm8916', 'asoc/topic/mtk', 'asoc/topic/nau8824', 'asoc/topic/nau8825' and 'asoc/topic/of-graph' into asoc-next Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rockchip' and 'asoc/topic/rt5514' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5614', 'asoc/topic/rt5645', 'asoc/topic/rt5651', 'asoc/topic/rt5665' and 'asoc/topic/rt5670' into asoc-next Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000' and 'asoc/topic/sh' into asoc-next Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx', 'asoc/topic/topology' and 'asoc/topic/wm-adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/cs35l35' and 'asoc/fix/da7219' into asoc-linus Merge remote-tracking branches 'asoc/fix/rockchip', 'asoc/fix/rt5645', 'asoc/fix/rt5663', 'asoc/fix/rt5670' and 'asoc/fix/zte' into asoc-linus 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/rcar' into asoc-next Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/ak4642', 'asoc/topic/atmel', 'asoc/topic/cs35l34' and 'asoc/topic/cs35l35' into asoc-next Merge remote-tracking branches 'asoc/topic/cs4271', 'asoc/topic/cs53l30', 'asoc/topic/da7213' and 'asoc/topic/da7218' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/drm', 'asoc/topic/dwc' and 'asoc/topic/es8316' into asoc-next Merge remote-tracking branch 'asoc/topic/inte' into asoc-next Matthias Kaehlcke (2): ASoC: cht_bsw_max98090_ti: Remove unused function cht_get_codec_dai() ASoC: Intel: sst: Remove unused function sst_restore_shim64() Mengdong Lin (1): ASoC: Drop invalid DMI fields when setting card long name from DMI info Naveen M (7): ASoC: Intel: Convert atom machine data to C99 style ASoC: Intel: Convert skl machine data to C99 style ASoC: Intel: Create a helper to search for matching machine ASoC: Move quirk to identify correct machine driver ASoC: Improve machine driver selection based on quirk data ASoC: Intel: Add Kabylake Realtek Maxim machine driver ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver entry Oder Chiou (4): ASoC: rt5514: Add more width and channels support in the TDM mode ASoC: rt5514: Add ACPI match ID ASoC: rt5663: Fix the IRQ issue ASoC: rt5663: Check the JD status in the resume function Peter Rosin (1): ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count Peter Ujfalusi (1): ASoC: davinci-mcasp: Support for one channel (mono) audio Pierre-Louis Bossart (2): ASoC: Intel: cht_bsw_rt5672: 19.2MHz clock for Baytrail platforms ASoC: codecs: rt5670: fix jd mode for Lenovo Miix 2 10 Ramesh Babu (2): ASoC: Intel: Skylake: Add deep buffer support ASoC: Intel: Skylake: Fix dma buffer size calculation Richard Fitzgerald (3): ASoC: wm_adsp: Fix type warning in sprintf ASoC: wm_adsp: Remove unused member of struct wm_coeff_ctl_ops ASoC: wm_adsp: Fix typo in algorithm list warning message Richard Leitner (1): ASoC: sgtl5000: add avc support Ryo Kodama (1): ASoC: ak4613: Improve counting DAI number Satish Babu Patakokila (1): ASoC: compress: Derive substream from stream based on direction Shawn Guo (4): ASoC: zx-i2s: fix harsh noise with 16-bit audio ASoC: zx-i2s: flip I2S master/slave mode ASoC: audio-graph-card: update bindings for amplifier support ASoC: audio-graph-card: add widgets and routing for external amplifier support Shreyas NC (1): ASoC: Intel: Skylake: Support for multiple data blocks Subhransu S. Prusty (2): ASoC: Intel: Skylake: Fix typo for token d0i3 caps ASoC: skl_rt286: Add deepbuffer dai link Sugar Zhang (3): ASoC: rockchip: add support for pdm controller ASoC: rockchip: add bindings for spdif controller ASoC: rockchip: i2s: add a delay before i2s clear Sylwester Nawrocki (1): ASoC: samsung: Odroid DT binding documentation corrections Takashi Iwai (11): ASoC: atmel: Use IS_ENABLED() ASoC: intel: byt: Constify hw_constraints ASoC: intel: skl: Constify hw_constraints ASoC: cs35l34: Constify hw_constraints ASoC: cs53l30: Constify hw_constraints ASoC: mediatek: Constify hw_constraints ASoC: samsung: Constify hw_constraints ASoC: intel: bxt: Constify hw_constraints ASoC: intel: Use kvzalloc() for suspend buffers ASoC: rt5645: Add jack detection workaround for GPD Win ASoC: rt5645: Add quirk override by module option Takashi Sakamoto (3): ASoC: codecs: msm8916: fix invalid cast to bool type ASoC: hisilicon: localize functions without external linkage ASoC: intel: atom: localize variable without external linkage Tomas Vilda (1): ASoC: tlv320dac31xx: Fix mistype in tlv320dac31xx codec Vijendar Mukunda (1): ASoC: dwc: Added a quirk DW_I2S_QUIRK_16BIT_IDX_OVERRIDE to dwc driver Vinod Koul (4): ASoC: Intel: Skylake: Add debugfs support ASoC: Intel: Skylake: Debugfs facility to dump module config ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h ASoC: Intel: Skylake: Remove driver debugfs exit Vunny Sodhi (1): ASoC: Intel: Skylake: Add support to read firmware registers Wei Yongjun (1): ASoC: rt5665: make local symbol rt5665_i2c_driver static Wu Fengguang (1): ASoC: fix semicolon.cocci warnings olivier moysan (14): ASoC: stm32: Document STM32 I2S bindings ASoC: stm32: Add I2S driver ASoC: stm32: Add full duplex support to i2s ASoC: stm32: sai: fix DT example ASoC: stm32: sai: typo fixes ASoC: stm32: sai: remove spurious trace ASoC: stm32: sai: change stop sequence ASoC: stm32: sai: fix clock management ASoC: stm32: sai: manage master clock ASoC: stm32: add h7 support for sai ASoC: stm32: sai: add h7 support ASoC: stm32: change configuration flag ASoC: stm32: Add DT bindings for SPDIFRX interface ASoC: stm32: Add SPDIFRX support zhangjun (1): ASoC: rockchip: i2s: add other configurable formats .../bindings/display/bridge/adi,adv7511.txt | 8 + .../bindings/display/bridge/renesas,dw-hdmi.txt | 9 +- .../devicetree/bindings/sound/audio-graph-card.txt | 129 +++ .../bindings/sound/audio-graph-scu-card.txt | 122 +++ .../devicetree/bindings/sound/cs35l35.txt | 3 + .../devicetree/bindings/sound/nau8825.txt | 3 + .../devicetree/bindings/sound/renesas,rsnd.txt | 37 +- .../devicetree/bindings/sound/rockchip,pdm.txt | 39 + .../devicetree/bindings/sound/rockchip-spdif.txt | 2 + .../devicetree/bindings/sound/samsung,odroid.txt | 15 +- .../devicetree/bindings/sound/simple-scu-card.txt | 67 +- .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 ++ .../devicetree/bindings/sound/st,stm32-sai.txt | 41 +- .../devicetree/bindings/sound/st,stm32-spdifrx.txt | 56 ++ .../devicetree/bindings/sound/sun4i-codec.txt | 11 +- .../bindings/sound/sun8i-codec-analog.txt | 1 + .../devicetree/bindings/sound/zte,zx-aud96p22.txt | 24 + Documentation/sound/soc/dapm.rst | 18 + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 22 + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 21 + drivers/of/base.c | 62 +- include/linux/of_graph.h | 21 + include/sound/cs35l35.h | 2 + include/sound/designware_i2s.h | 1 + include/sound/hdmi-codec.h | 9 + include/sound/rt5645.h | 6 +- include/sound/simple_card_utils.h | 43 +- include/sound/soc-dapm.h | 7 + include/sound/soc-topology.h | 5 + include/sound/soc.h | 3 + include/uapi/sound/asoc.h | 10 +- include/uapi/sound/snd_sst_tokens.h | 8 +- sound/soc/atmel/atmel-pcm.h | 6 +- sound/soc/atmel/tse850-pcm5142.c | 4 +- sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/ak4613.c | 95 +- sound/soc/codecs/ak4642.c | 4 +- sound/soc/codecs/cs35l34.c | 4 +- sound/soc/codecs/cs35l35.c | 94 +- sound/soc/codecs/cs35l35.h | 6 + sound/soc/codecs/cs4271.c | 2 - sound/soc/codecs/cs53l30.c | 2 +- sound/soc/codecs/da7213.c | 37 +- sound/soc/codecs/da7218.c | 2 +- sound/soc/codecs/da7219-aad.c | 31 +- sound/soc/codecs/da7219.c | 53 +- sound/soc/codecs/da7219.h | 5 +- sound/soc/codecs/es8316.c | 637 +++++++++++++ sound/soc/codecs/es8316.h | 129 +++ sound/soc/codecs/hdmi-codec.c | 92 +- sound/soc/codecs/max9867.c | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 6 +- sound/soc/codecs/nau8824.c | 52 ++ sound/soc/codecs/nau8824.h | 12 + sound/soc/codecs/nau8825.c | 76 +- sound/soc/codecs/nau8825.h | 1 + sound/soc/codecs/rt5514.c | 37 +- sound/soc/codecs/rt5514.h | 6 + sound/soc/codecs/rt5645.c | 97 +- sound/soc/codecs/rt5651.c | 44 +- sound/soc/codecs/rt5663.c | 4 +- sound/soc/codecs/rt5663.h | 4 + sound/soc/codecs/rt5665.c | 158 ++-- sound/soc/codecs/rt5670.c | 25 +- sound/soc/codecs/rt5677.c | 32 +- sound/soc/codecs/sgtl5000.c | 89 ++ sound/soc/codecs/tlv320aic31xx.c | 2 +- sound/soc/codecs/wm_adsp.c | 6 +- sound/soc/codecs/zx_aud96p22.c | 403 +++++++++ sound/soc/davinci/davinci-mcasp.c | 12 +- sound/soc/dwc/dwc-i2s.c | 6 + sound/soc/fsl/mpc5200_dma.c | 1 - sound/soc/generic/Kconfig | 17 + sound/soc/generic/Makefile | 4 + sound/soc/generic/audio-graph-card.c | 338 +++++++ sound/soc/generic/audio-graph-scu-card.c | 411 +++++++++ sound/soc/generic/simple-card-utils.c | 198 +++- sound/soc/generic/simple-card.c | 69 +- sound/soc/generic/simple-scu-card.c | 55 +- sound/soc/hisilicon/hi6210-i2s.c | 11 +- sound/soc/intel/Kconfig | 42 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/atom/sst/sst.c | 59 +- sound/soc/intel/atom/sst/sst.h | 30 +- sound/soc/intel/atom/sst/sst_acpi.c | 232 +++-- sound/soc/intel/boards/Makefile | 6 + sound/soc/intel/boards/bdw-rt5677.c | 26 + sound/soc/intel/boards/bxt_da7219_max98357a.c | 26 +- sound/soc/intel/boards/bxt_rt298.c | 19 +- sound/soc/intel/boards/byt-max98090.c | 24 +- sound/soc/intel/boards/bytcht_es8316.c | 300 +++++++ sound/soc/intel/boards/bytcht_nocodec.c | 4 +- sound/soc/intel/boards/bytcr_rt5651.c | 4 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 - sound/soc/intel/boards/cht_bsw_rt5672.c | 89 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 687 ++++++++++++++ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 640 +++++++++++++ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- sound/soc/intel/boards/skl_rt286.c | 30 +- sound/soc/intel/common/sst-acpi.h | 23 + sound/soc/intel/common/sst-dsp-priv.h | 4 + sound/soc/intel/common/sst-match-acpi.c | 47 +- sound/soc/intel/skylake/Makefile | 4 + sound/soc/intel/skylake/bxt-sst.c | 4 + sound/soc/intel/skylake/skl-debug.c | 261 ++++++ sound/soc/intel/skylake/skl-messages.c | 31 +- sound/soc/intel/skylake/skl-pcm.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 5 + sound/soc/intel/skylake/skl-topology.c | 187 +++- sound/soc/intel/skylake/skl-topology.h | 21 + sound/soc/intel/skylake/skl-tplg-interface.h | 2 + sound/soc/intel/skylake/skl.c | 114 ++- sound/soc/intel/skylake/skl.h | 23 + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- sound/soc/omap/mcbsp.c | 12 +- sound/soc/pxa/Kconfig | 2 +- sound/soc/rockchip/Kconfig | 9 + sound/soc/rockchip/Makefile | 2 + sound/soc/rockchip/rockchip_i2s.c | 41 +- sound/soc/rockchip/rockchip_i2s.h | 3 + sound/soc/rockchip/rockchip_pdm.c | 516 +++++++++++ sound/soc/rockchip/rockchip_pdm.h | 83 ++ sound/soc/rockchip/rockchip_spdif.c | 4 + sound/soc/samsung/s3c24xx_uda134x.c | 2 +- sound/soc/sh/Kconfig | 2 +- sound/soc/sh/fsi.c | 13 +- sound/soc/sh/rcar/adg.c | 61 +- sound/soc/sh/rcar/cmd.c | 7 +- sound/soc/sh/rcar/core.c | 494 +++++++--- sound/soc/sh/rcar/ctu.c | 6 + sound/soc/sh/rcar/dma.c | 32 +- sound/soc/sh/rcar/dvc.c | 12 +- sound/soc/sh/rcar/gen.c | 2 + sound/soc/sh/rcar/rsnd.h | 68 +- sound/soc/sh/rcar/src.c | 20 +- sound/soc/sh/rcar/ssi.c | 241 +++-- sound/soc/sh/rcar/ssiu.c | 37 + sound/soc/soc-compress.c | 6 +- sound/soc/soc-core.c | 86 +- sound/soc/soc-topology.c | 37 +- sound/soc/stm/Kconfig | 29 +- sound/soc/stm/Makefile | 12 +- sound/soc/stm/stm32_i2s.c | 946 +++++++++++++++++++ sound/soc/stm/stm32_sai.c | 15 +- sound/soc/stm/stm32_sai.h | 73 +- sound/soc/stm/stm32_sai_sub.c | 143 ++- sound/soc/stm/stm32_spdifrx.c | 998 +++++++++++++++++++++ sound/soc/sunxi/sun4i-codec.c | 63 ++ sound/soc/sunxi/sun8i-codec-analog.c | 145 ++- sound/soc/zte/zx-i2s.c | 15 +- 152 files changed, 10306 insertions(+), 1191 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt create mode 100644 sound/soc/codecs/es8316.c create mode 100644 sound/soc/codecs/es8316.h create mode 100644 sound/soc/codecs/zx_aud96p22.c create mode 100644 sound/soc/generic/audio-graph-card.c create mode 100644 sound/soc/generic/audio-graph-scu-card.c create mode 100644 sound/soc/intel/boards/bytcht_es8316.c create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c create mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c create mode 100644 sound/soc/intel/skylake/skl-debug.c create mode 100644 sound/soc/rockchip/rockchip_pdm.c create mode 100644 sound/soc/rockchip/rockchip_pdm.h create mode 100644 sound/soc/stm/stm32_i2s.c create mode 100644 sound/soc/stm/stm32_spdifrx.c

2 1

[alsa-devel] [PATCH 1/2] ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h
by Guneshwor Singh 03 Jul '17

03 Jul '17

From: Vinod Koul <vinod.koul(a)intel.com> Commit bdd0384a5ada ("ASoC: Intel: Skylake: Add support to read firmware registers") introduced firmware register read so added sst-dsp-priv.h but missed adding sst-dsp.h as that leads to below compiler warning: In file included from sound/soc/intel/skylake/skl-debug.c:23:0: >> sound/soc/intel/skylake/../common/sst-dsp-priv.h:63:42: warning: 'struct sst_pdata' declared inside parameter list [enabled by default] int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata); ^ >> sound/soc/intel/skylake/../common/sst-dsp-priv.h:63:42: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] So add the missing header. Fixes: bdd0384a5ada ("ASoC: Intel: Skylake: Add support to read firmware registers") Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/soc/intel/skylake/skl-debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/skylake/skl-debug.c b/sound/soc/intel/skylake/skl-debug.c index 75497b1fda45..34d06abbf796 100644 --- a/sound/soc/intel/skylake/skl-debug.c +++ b/sound/soc/intel/skylake/skl-debug.c @@ -20,6 +20,7 @@ #include "skl-sst-ipc.h" #include "skl-tplg-interface.h" #include "skl-topology.h" +#include "../common/sst-dsp.h" #include "../common/sst-dsp-priv.h" #define MOD_BUF PAGE_SIZE -- 2.13.0

2 3

Re: [alsa-devel] ioctl(fd, SNDRV_CTL_IOCTL_ELEM_REPLACE, ... not working from userspace ?
by Clemens Ladisch 03 Jul '17

03 Jul '17

Fulup Ar Foll wrote: > Looking at this code I do not understand why the replace iotcl is refused. if (!(kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_USER)) { ret = -EINVAL; Kernel drivers do not expect that their own controls change. Regards, Clemens

1 0

[alsa-devel] [PATCH 0/6] add support for Sama5d2 audio PLL and enable ClassD
by Quentin Schulz 03 Jul '17

03 Jul '17

This patch series adds support for the audio PLL and enables ClassD that can be found in ATMEL Sama5d2 SoCs. There are two audio PLLs (PMC and PAD) that shares the same parent (FRAC). FRAC can output between 620 and 700MHz and only multiply the rate of its parent. The two audio PLLs then divide the FRAC rate to best match the asked rate. I basically took an old patch series posted by Nicolas on December, 6th 2016[1][2][3] and the comments Boris did on the first version[4] Nicolas sent on July, 15th 2015. I also fixed the function used to compute the divisors, removed useless spinlocks and added a range to the audio frac PLL to stay within vendor's supported range. Clocks that are children of gclk (generated-clk) are now able to propagate rate to the audio PLL clocks when needed. However, since there is no rate locking, we enforce that classd_gclk be the only child of audio_pll_pmc so we avoid multiple children modifiying parent's rate, and classd driver modifying parent's rate which would impact the rate of each of parent's children. Thanks, Quentin [1] https://patchwork.kernel.org/patch/9462351/ [2] https://patchwork.kernel.org/patch/9462347/ [3] https://patchwork.kernel.org/patch/9462349/ [4] https://www.spinics.net/lists/arm-kernel/msg436120.html Cyrille Pitchen (2): ARM: dts: at91: sama5d2: add classd nodes ARM: dts: at91: sama5d2_xplained: add pin muxing and enable classd Nicolas Ferre (1): clk: at91: add audio pll clock driver Quentin Schulz (3): clk: at91: clk-generated: remove useless divisor loop clk: at91: clk-generated: create function to find best_diff clk: at91: clk-generated: make gclk determine audio_pll rate .../devicetree/bindings/clock/at91-clock.txt | 10 + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 16 ++ arch/arm/boot/dts/sama5d2.dtsi | 39 +++- arch/arm/mach-at91/Kconfig | 4 + drivers/clk/at91/Makefile | 2 + drivers/clk/at91/clk-audio-pll-pad.c | 204 ++++++++++++++++++ drivers/clk/at91/clk-audio-pll-pmc.c | 175 +++++++++++++++ drivers/clk/at91/clk-audio-pll.c | 237 +++++++++++++++++++++ drivers/clk/at91/clk-generated.c | 79 +++++-- include/linux/clk/at91_pmc.h | 25 +++ sound/soc/atmel/atmel-classd.c | 20 +- 11 files changed, 772 insertions(+), 39 deletions(-) create mode 100644 drivers/clk/at91/clk-audio-pll-pad.c create mode 100644 drivers/clk/at91/clk-audio-pll-pmc.c create mode 100644 drivers/clk/at91/clk-audio-pll.c -- 2.11.0

4 13