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

[alsa-devel] [PATCH 1/2] ASoC: Intel: sof-rt5682: add MCLK support for BYT platform
by Bard liao 18 Jun '19

18 Jun '19

From: Xun Zhang <xun2.zhang(a)intel.com> The sof-rt5682 machine driver currently uses BCLK on BYT/Minnowboard platform. The MCLK signal is available since the Turbot revision, so enable MCLK on BYT/Minnowboard Turbot platform. Signed-off-by: Xun Zhang <xun2.zhang(a)intel.com> Signed-off-by: Bard liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/boards/sof_rt5682.c | 65 ++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index e2e5f97d9920..f3d481b75b15 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -9,6 +9,7 @@ #include <linux/input.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/clk.h> #include <linux/dmi.h> #include <sound/core.h> #include <sound/jack.h> @@ -32,6 +33,7 @@ #define SOF_RT5682_SSP_AMP_MASK (GENMASK(8, 6)) #define SOF_RT5682_SSP_AMP(quirk) \ (((quirk) << SOF_RT5682_SSP_AMP_SHIFT) & SOF_RT5682_SSP_AMP_MASK) +#define SOF_RT5682_MCLK_BYTCHT_EN BIT(9) /* Default: MCLK on, MCLK 19.2M, SSP0 */ static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN | @@ -48,6 +50,7 @@ struct sof_hdmi_pcm { }; struct sof_card_private { + struct clk *mclk; struct snd_soc_jack sof_headset; struct list_head hdmi_pcm_list; }; @@ -59,6 +62,22 @@ static int sof_rt5682_quirk_cb(const struct dmi_system_id *id) } static const struct dmi_system_id sof_rt5682_quirk_table[] = { + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"), + DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max"), + }, + .driver_data = (void *)(SOF_RT5682_SSP_CODEC(2)), + }, + { + .callback = sof_rt5682_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + DMI_MATCH(DMI_PRODUCT_NAME, "UP-CHT01"), + }, + .driver_data = (void *)(SOF_RT5682_SSP_CODEC(2)), + }, { .callback = sof_rt5682_quirk_cb, .matches = { @@ -127,6 +146,27 @@ static int sof_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) RT5682_CLK_SEL_I2S1_ASRC); } + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + /* + * The firmware might enable the clock at + * boot (this information may or may not + * be reflected in the enable clock register). + * To change the rate we must disable the clock + * first to cover these cases. Due to common + * clock framework restrictions that do not allow + * to disable a clock that has not been enabled, + * we need to enable the clock first. + */ + ret = clk_prepare_enable(ctx->mclk); + if (!ret) + clk_disable_unprepare(ctx->mclk); + + ret = clk_set_rate(ctx->mclk, 19200000); + + if (ret) + dev_err(rtd->dev, "unable to set MCLK rate\n"); + } + /* * Headset buttons map to the google Reference headset. * These can be configured by userspace. @@ -161,10 +201,20 @@ static int sof_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *codec_dai = rtd->codec_dai; int clk_id, clk_freq, pll_out, ret; if (sof_rt5682_quirk & SOF_RT5682_MCLK_EN) { + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + ret = clk_prepare_enable(ctx->mclk); + if (ret < 0) { + dev_err(rtd->dev, + "could not configure MCLK state"); + return ret; + } + } + clk_id = RT5682_PLL1_S_MCLK; if (sof_rt5682_quirk & SOF_RT5682_MCLK_24MHZ) clk_freq = 24000000; @@ -507,7 +557,9 @@ static int sof_audio_probe(struct platform_device *pdev) dmic_num = 0; hdmi_num = 0; /* default quirk for legacy cpu */ - sof_rt5682_quirk = SOF_RT5682_SSP_CODEC(2); + sof_rt5682_quirk = SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_BYTCHT_EN | + SOF_RT5682_SSP_CODEC(2); } else { dmic_num = 1; hdmi_num = 3; @@ -515,6 +567,17 @@ static int sof_audio_probe(struct platform_device *pdev) dmi_check_system(sof_rt5682_quirk_table); + /* need to get main clock from pmc */ + if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) { + ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3"); + ret = clk_prepare_enable(ctx->mclk); + if (ret < 0) { + dev_err(&pdev->dev, + "could not configure MCLK state"); + return ret; + } + } + dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk); ssp_amp = (sof_rt5682_quirk & SOF_RT5682_SSP_AMP_MASK) >> -- 2.17.1

2 2

Re: [alsa-devel] udev: Access permission of fw character device in which fw node includes unit handled by ALSA
by Takashi Sakamoto 18 Jun '19

18 Jun '19

Hi Lennart, Thanks for your reply, and notice to this legacy and minor issue ;) On Mon, Jun 17, 2019, at 22:26, Lennart Poettering wrote: > On Mo, 20.05.19 21:27, Takashi Sakamoto (o-takashi(a)sakamocchi.jp) wrote: > > > Hi all, > > > > I'm an ALSA developer, mainly committing to drivers for audio and > > music units on IEEE 1394 bus (yes, it's legacy FireWire). I have a > > concern about access permission for fw character device. > > I am not sure I understand firewire well enough to say something too > smart. But if I understand correctly, then we (in systemd upstream) > currently only have these four firewire specific rules in our tree: > > SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video" > SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video" > SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video" > SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video" > > And all of these are handled by some firewire core driver? Although it's probable that some of them are handled by in-kernel driver (perhaps firedtv.ko), they're just for userspace applications. The in-kernel driver adds another device to system (in this case video character device) and access rules to it are apart from the one for fw character device, as long as all features are implemented in the in-kernel driver. In a case of drivers in ALSA firewire stack, we decided to implement a part of features in userspace application, due to the complexity of vendor-dependent protocols. The in-kernel drivers just implement isochronous packet streaming for PCM frames and MIDI messages, and tells userspace applications the related fw character device via ALSA hwdep interface[1]. > The devices you care about, how would the rules look like for this? Here, I'd like to explain about the relationships between instances on IEEE 1394 bus topology and fw character device, modalias on in-kernel driver. ``` IEEE 1394 bus + node A (=fw character device, /dew/fw0) + unit A1 (=modalias on in-kernel driver, fw0.0) + unit B2 (=modalias on in-kernel driver, fw0.1) + ... + node B (=fw character device, /dev/fw1) + unit B1 (=modalias on in-kernel driver, fw1.0) + unit B2 (=modalias on in-kernel driver, fw1.1) + ... + ... ``` The relationship between node/unit is similar to device/interface in USB case. One node can includes several units which represent actual functionalities, and any in-kernel driver is bound to one of the units. On the other hand, fw character device is added for each node. The node is subject of communication. When any driver in ALSA firewire stack is bound to one of units in a node, I expect udevd to change group of the corresponding fw character device to 'audio', and expect logind to assign ACL to it. + node A (fw character device with 'audio' group, +uaccess) + unit A1 (any driver in ALSA firewire stack is bound to) In current framework of udev rule, this seems to be difficult to achieve, in my opinion. Thus, if I managed to achieve it by rule framework, I would add and maintain many entries generated from my registry[2]. > In general, when it comes to auto-loading of drivers we usually expect > the kernel to add modalias metadata to .ko files. > > In the hwdb usually mostly only "auxiliary" data is stored, i.e. stuff > that is great to have but is not essential for a device to work > basically. > > Rules files should generally be kept short. i.e. if you add 3 more > rules for the devices you care about, that'd be fine — if you add 100, > then that's not so great however, and another approach should be > found. Yes. I'd like to avoid increasing maintenance cost of anybody including myself... > Anyway, given that I am not a firewire pro, I figure you have to > decide yourself what the best approach is, and then prep a PR and we > can have a look. Without looking at an (maybe just RFC) patch I am not > sure I grok enugh to properly comment on it. Okay. I'll attempt to post several RFC patches. It takes me a bit long time because this is my first attempt to commit systemd, but I'm happy if you review and comment to them. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/inc… [2] https://github.com/takaswie/am-config-roms Thanks Takashi Sakamoto

1 0

[alsa-devel] [PATCH] dt-bindings: Add missing newline at end of file
by Geert Uytterhoeven 18 Jun '19

18 Jun '19

"git diff" says: \ No newline at end of file after modifying the files. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 2 +- .../devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt | 2 +- Documentation/devicetree/bindings/regulator/pv88060.txt | 2 +- Documentation/devicetree/bindings/sound/cs42l73.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt index 3538a214fff156d4..352f5e9c759bc3f5 100644 --- a/Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt +++ b/Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt @@ -36,4 +36,4 @@ Example: kcs_chan = <2>; status = "disabled"; }; - }; \ No newline at end of file + }; diff --git a/Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt index 83f4bbac94bb19db..a1264cc8660dcd59 100644 --- a/Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt @@ -213,4 +213,4 @@ pinctrl: pinctrl@f0800000 { groups = "clkreq"; function = "clkreq"; }; -}; \ No newline at end of file +}; diff --git a/Documentation/devicetree/bindings/regulator/pv88060.txt b/Documentation/devicetree/bindings/regulator/pv88060.txt index 10a6dadc008eb38d..6a7c8a92fdb0bf1c 100644 --- a/Documentation/devicetree/bindings/regulator/pv88060.txt +++ b/Documentation/devicetree/bindings/regulator/pv88060.txt @@ -121,4 +121,4 @@ Example regulator-max-microvolt = <5000000>; }; }; - }; \ No newline at end of file + }; diff --git a/Documentation/devicetree/bindings/sound/cs42l73.txt b/Documentation/devicetree/bindings/sound/cs42l73.txt index 80ae910dbf6c3880..47b868b5ab011470 100644 --- a/Documentation/devicetree/bindings/sound/cs42l73.txt +++ b/Documentation/devicetree/bindings/sound/cs42l73.txt @@ -19,4 +19,4 @@ codec: cs42l73@4a { reg = <0x4a>; reset_gpio = <&gpio 10 0>; chgfreq = <0x05>; -}; \ No newline at end of file +}; -- 2.17.1

2 1

[alsa-devel] [PATCH] ASoC: soc-core: export function to find components
by bgoswami＠codeaurora.org 18 Jun '19

18 Jun '19

From: Banajit Goswami <bgoswami(a)codeaurora.org> Drivers may need to use the ASoC core function to find out whether a particular component is already registered with ASoC core or not. Export the function so that drivers can use it outside of the file. Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> --- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 482b4ea..def975f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1405,6 +1405,8 @@ int snd_soc_component_update_bits_async(struct snd_soc_component *component, void snd_soc_component_async_complete(struct snd_soc_component *component); int snd_soc_component_test_bits(struct snd_soc_component *component, unsigned int reg, unsigned int mask, unsigned int value); +struct snd_soc_component *soc_find_component( + const struct device_node *of_node, const char *name); /* component wide operations */ int snd_soc_component_set_sysclk(struct snd_soc_component *component, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 41c0cfa..50a9977 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -741,7 +741,17 @@ int snd_soc_resume(struct device *dev) static const struct snd_soc_dai_ops null_dai_ops = { }; -static struct snd_soc_component *soc_find_component( +/** + * soc_find_component: find a component from component_list in ASoC core + * + * @of_node: of_node of the component to query. + * @name: name of the component to query. + * + * function to find out if a component is already registered with ASoC core. + * + * Returns component handle for success, else NULL error. + */ +struct snd_soc_component *soc_find_component( const struct device_node *of_node, const char *name) { struct snd_soc_component *component; @@ -764,6 +774,7 @@ static struct snd_soc_component *soc_find_component( return NULL; } +EXPORT_SYMBOL(soc_find_component); static int snd_soc_is_matching_component( const struct snd_soc_dai_link_component *dlc, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 2

[alsa-devel] [PATCH v2 0/3] ASoC: SOF: fix suspend ordering with runtime idle
by Kai Vehmanen 18 Jun '19

18 Jun '19

Hi all, this series addresses issues with ordering of HDA codec and controller suspends in the runtime PM flows. The implemented logic for SOF is similar to what has been used by the Intel AZX HDA driver. To implement this, first a fix is needed to hdac_hdmic ASoC codec driver. SOF framework also needs to be extended to allow SOF devices to implement a runtime_idle callback. Third, concrete implementation is in a separate patch for APL/CNL Intel hardware, for which strict ordering of codec-controller power down sequence needs to be maintained. As this extends the SOF device interface, Pierre asked me to send to the list for wider review. This series has been prereviewd at SOF github as: https://github.com/thesofproject/linux/pull/1003 v2: - Rebased on broonie/for-next, there was a conflict with patch "ASoC: SOF: Intel: hda: release link DMA for paused streams during suspend" - Added Reviewed-by tags from v1 round Kai Vehmanen (3): ASoC: hdac_hdmi: report codec link up/down status to bus ASoC: SOF: add runtime idle callback ASoC: SOF: Intel: implement runtime idle for CNL/APL sound/soc/codecs/hdac_hdmi.c | 2 ++ sound/soc/sof/intel/apl.c | 1 + sound/soc/sof/intel/cnl.c | 1 + sound/soc/sof/intel/hda-dsp.c | 13 +++++++++++++ sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/ops.h | 8 ++++++++ sound/soc/sof/pm.c | 8 ++++++++ sound/soc/sof/sof-acpi-dev.c | 2 +- sound/soc/sof/sof-pci-dev.c | 2 +- sound/soc/sof/sof-priv.h | 2 ++ 10 files changed, 38 insertions(+), 2 deletions(-) -- 2.17.1

1 3

[alsa-devel] [PATCH] ASoC: Intel: boards: add dmic format constraint
by mac.chiang＠intel.com 18 Jun '19

18 Jun '19

From: Mac Chiang <mac.chiang(a)intel.com> platform dmic recording fixup 16bits Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index 5cadb7f..ac06408 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -330,6 +330,9 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &constraints_channels_quad); + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); + return snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); } -- 2.7.4

3 3

[alsa-devel] [PATCH] ALSA: compress: avoid integer overflow for long duration offload playback
by bgoswami＠codeaurora.org 18 Jun '19

18 Jun '19

From: Banajit Goswami <bgoswami(a)codeaurora.org> Currently a 32 bit variable is used for storing number of bytes copied to DSP, which can overflow when playback continues for a long duration. Change data type for this variable to __u64 to prevent overflow. Signed-off-by: Dhananjay Kumar <dhakumar(a)codeaurora.org> Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> --- include/uapi/sound/compress_offload.h | 2 +- sound/core/compress_offload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index 56d9567..db5edf3 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -67,7 +67,7 @@ struct snd_compr_params { */ struct snd_compr_tstamp { __u32 byte_offset; - __u32 copied_total; + __u64 copied_total; __u32 pcm_frames; __u32 pcm_io_frames; __u32 sampling_rate; diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a1a6fd7..2d0a709 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -184,7 +184,7 @@ static int snd_compr_update_tstamp(struct snd_compr_stream *stream, if (!stream->ops->pointer) return -ENOTSUPP; stream->ops->pointer(stream, tstamp); - pr_debug("dsp consumed till %d total %d bytes\n", + pr_debug("dsp consumed till %d total %llu bytes\n", tstamp->byte_offset, tstamp->copied_total); if (stream->direction == SND_COMPRESS_PLAYBACK) stream->runtime->total_bytes_transferred = tstamp->copied_total; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 2

[alsa-devel] [PATCH] ASoC: Intel: skl: extract common function
by Tzung-Bi Shih 18 Jun '19

18 Jun '19

Extract common logic to a function to avoid duplicate code. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- Refactor HDMI init to as most Intel machine drivers did, e.g. kbl_da7219_max98357a.c. .../soc/intel/boards/skl_nau88l25_max98357a.c | 39 +++++------------- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 40 +++++-------------- 2 files changed, 18 insertions(+), 61 deletions(-) diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index 3ce8efbeed12..485614c4fa47 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -179,7 +179,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai = rtd->codec_dai; @@ -189,7 +189,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) if (!pcm) return -ENOMEM; - pcm->device = SKL_DPCM_AUDIO_HDMI1_PB; + pcm->device = device; pcm->codec_dai = dai; list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -197,40 +197,19 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI2_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI1_PB); +} - return 0; +static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +{ + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI2_PB); } static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau8825_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI3_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI3_PB); } static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 1a7ac8bdf543..772cbd6940db 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -198,7 +198,7 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device) { struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai = rtd->codec_dai; @@ -208,7 +208,7 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) if (!pcm) return -ENOMEM; - pcm->device = SKL_DPCM_AUDIO_HDMI1_PB; + pcm->device = device; pcm->codec_dai = dai; list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -216,41 +216,19 @@ static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI2_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI1_PB); } +static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd) +{ + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI2_PB); +} static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd) { - struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *dai = rtd->codec_dai; - struct skl_hdmi_pcm *pcm; - - pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL); - if (!pcm) - return -ENOMEM; - - pcm->device = SKL_DPCM_AUDIO_HDMI3_PB; - pcm->codec_dai = dai; - - list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); - - return 0; + return skylake_hdmi_init(rtd, SKL_DPCM_AUDIO_HDMI3_PB); } static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd) -- 2.22.0.410.gd8fdbe21b5-goog

2 2

[alsa-devel] [PATCH] ASoC: Add missing newline at end of file
by Geert Uytterhoeven 18 Jun '19

18 Jun '19

"git diff" says: \ No newline at end of file after modifying the files. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- sound/soc/mediatek/common/Makefile | 2 +- sound/soc/tegra/Makefile | 2 +- sound/usb/bcd2000/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/common/Makefile b/sound/soc/mediatek/common/Makefile index 9ab90433a8d7b297..acbe01e9e9286d7a 100644 --- a/sound/soc/mediatek/common/Makefile +++ b/sound/soc/mediatek/common/Makefile @@ -3,4 +3,4 @@ snd-soc-mtk-common-objs := mtk-afe-platform-driver.o mtk-afe-fe-dai.o obj-$(CONFIG_SND_SOC_MEDIATEK) += snd-soc-mtk-common.o -obj-$(CONFIG_SND_SOC_MTK_BTCVSD) += mtk-btcvsd.o \ No newline at end of file +obj-$(CONFIG_SND_SOC_MTK_BTCVSD) += mtk-btcvsd.o diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 2329b72c93e37807..c84f183919f2f1ab 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -37,4 +37,4 @@ obj-$(CONFIG_SND_SOC_TEGRA_WM9712) += snd-soc-tegra-wm9712.o obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o obj-$(CONFIG_SND_SOC_TEGRA_ALC5632) += snd-soc-tegra-alc5632.o obj-$(CONFIG_SND_SOC_TEGRA_MAX98090) += snd-soc-tegra-max98090.o -obj-$(CONFIG_SND_SOC_TEGRA_SGTL5000) += snd-soc-tegra-sgtl5000.o \ No newline at end of file +obj-$(CONFIG_SND_SOC_TEGRA_SGTL5000) += snd-soc-tegra-sgtl5000.o diff --git a/sound/usb/bcd2000/Makefile b/sound/usb/bcd2000/Makefile index 99546074e5f47ddb..e2d916e24787f963 100644 --- a/sound/usb/bcd2000/Makefile +++ b/sound/usb/bcd2000/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only snd-bcd2000-y := bcd2000.o -obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o \ No newline at end of file +obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o -- 2.17.1

3 3

[alsa-devel] [RFC PATCH 0/6] ALSA/HDA: abort probe when DMICs are detected
by Pierre-Louis Bossart 18 Jun '19

18 Jun '19

This is the second take on same problem of detecting when the HDaudio legacy driver can be used and when the SST or SOF drivers are required. The previous attempt based on a the PCI Class information was a resounding failure and broke audio on Linus' laptop, so we need additional information to avoid enabling a DSP-based driver without a good reason to do so. This patchset suggests the use of the NHLT information which *in theory* exposes DMIC endpoints. The legacy HDaudio driver cannot handle DMICs and will not provide any capture capabilities. Since it's typically the first one to probe due to the Makefile order, aborting the probe will let the PCI subsystem look for the next driver which hopefully will support this capability. I tested this patch on 5 devices (SKL, KBL, APL, GLK, WHL), three without DMICs and two with, and the detection seems to work as planned. I would appreciate it if HDaudio integrators and folks at Google/Canonical/Endless can give this a try. As usual I expect that we will have to use quirks and work-arounds, but it'd be a better idea than a build-time mutual exclusion. We could also make this optional (Kconfig and/or module parameters) if people prefer to muck with blacklists. Feedback and comments welcome! Pierre-Louis Bossart (6): ASoC: Intel: boards: remove unnecessary inclusion of skl.h ASoC: Intel: Skylake: move NHLT header to common directory ASoC: Intel: common: move parts of NHLT code to new module ASoC: Intel: Skylake: use common NHLT module ALSA / hda: stop probe if DMICS are detected on Skylake+ platforms [HACK] ASoC: Intel: NHLT: handle VENDOR_DEFINED DMIC geometry sound/pci/hda/Kconfig | 1 + sound/pci/hda/hda_intel.c | 30 ++++++ sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/glk_rt5682_max98357a.c | 1 - sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 - sound/soc/intel/boards/kbl_da7219_max98927.c | 1 - sound/soc/intel/boards/skl_hda_dsp_common.c | 1 - sound/soc/intel/common/Makefile | 3 + sound/soc/intel/common/intel-nhlt.c | 101 ++++++++++++++++++ .../skl-nhlt.h => common/intel-nhlt.h} | 28 +++++ sound/soc/intel/skylake/skl-nhlt.c | 91 +--------------- sound/soc/intel/skylake/skl-ssp-clk.c | 1 + sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl.c | 11 +- sound/soc/intel/skylake/skl.h | 4 - 15 files changed, 176 insertions(+), 102 deletions(-) create mode 100644 sound/soc/intel/common/intel-nhlt.c rename sound/soc/intel/{skylake/skl-nhlt.h => common/intel-nhlt.h} (83%) -- 2.20.1

4 26