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

Re: [alsa-devel] [PATCH v3 03/15] soc: tegra: Add Tegra PMC clock registrations into PMC driver
by Dmitry Osipenko 12 Dec '19

12 Dec '19

11.12.2019 21:50, Sowjanya Komatineni пишет: > > On 12/10/19 5:06 PM, Sowjanya Komatineni wrote: >> >> On 12/10/19 9:41 AM, Dmitry Osipenko wrote: >>> 10.12.2019 19:53, Sowjanya Komatineni пишет: >>>> On 12/9/19 3:03 PM, Sowjanya Komatineni wrote: >>>>> On 12/9/19 12:46 PM, Sowjanya Komatineni wrote: >>>>>> On 12/9/19 12:12 PM, Dmitry Osipenko wrote: >>>>>>> 08.12.2019 00:36, Sowjanya Komatineni пишет: >>>>>>>> On 12/7/19 11:59 AM, Sowjanya Komatineni wrote: >>>>>>>>> On 12/7/19 8:00 AM, Dmitry Osipenko wrote: >>>>>>>>>> 07.12.2019 18:53, Dmitry Osipenko пишет: >>>>>>>>>>> 07.12.2019 18:47, Dmitry Osipenko пишет: >>>>>>>>>>>> 07.12.2019 17:28, Dmitry Osipenko пишет: >>>>>>>>>>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>>>>>>>>>> Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, >>>>>>>>>>>>>> clk_out_3 >>>>>>>>>>>>>> with >>>>>>>>>>>>>> mux and gate for each of these clocks. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Currently these PMC clocks are registered by Tegra clock >>>>>>>>>>>>>> driver >>>>>>>>>>>>>> using >>>>>>>>>>>>>> clk_register_mux and clk_register_gate by passing PMC base >>>>>>>>>>>>>> address >>>>>>>>>>>>>> and register offsets and PMC programming for these clocks >>>>>>>>>>>>>> happens >>>>>>>>>>>>>> through direct PMC access by the clock driver. >>>>>>>>>>>>>> >>>>>>>>>>>>>> With this, when PMC is in secure mode any direct PMC access >>>>>>>>>>>>>> from the >>>>>>>>>>>>>> non-secure world does not go through and these clocks will >>>>>>>>>>>>>> not be >>>>>>>>>>>>>> functional. >>>>>>>>>>>>>> >>>>>>>>>>>>>> This patch adds these clocks registration with PMC as a clock >>>>>>>>>>>>>> provider >>>>>>>>>>>>>> for these clocks. clk_ops callback implementations for these >>>>>>>>>>>>>> clocks >>>>>>>>>>>>>> uses tegra_pmc_readl and tegra_pmc_writel which supports PMC >>>>>>>>>>>>>> programming >>>>>>>>>>>>>> in secure mode and non-secure mode. >>>>>>>>>>>>>> >>>>>>>>>>>>>> Signed-off-by: Sowjanya Komatineni <skomatineni(a)nvidia.com> >>>>>>>>>>>>>> --- >>>>>>>>>>>> [snip] >>>>>>>>>>>> >>>>>>>>>>>>>> + >>>>>>>>>>>>>> +static const struct clk_ops pmc_clk_gate_ops = { >>>>>>>>>>>>>> + .is_enabled = pmc_clk_is_enabled, >>>>>>>>>>>>>> + .enable = pmc_clk_enable, >>>>>>>>>>>>>> + .disable = pmc_clk_disable, >>>>>>>>>>>>>> +}; >>>>>>>>>>>>> What's the benefit of separating GATE from the MUX? >>>>>>>>>>>>> >>>>>>>>>>>>> I think it could be a single clock. >>>>>>>>>>>> According to TRM: >>>>>>>>>>>> >>>>>>>>>>>> 1. GATE and MUX are separate entities. >>>>>>>>>>>> >>>>>>>>>>>> 2. GATE is the parent of MUX (see PMC's CLK_OUT paths diagram >>>>>>>>>>>> in TRM). >>>>>>>>>>>> >>>>>>>>>>>> 3. PMC doesn't gate EXTPERIPH clock but could "force-enable" >>>>>>>>>>>> it, >>>>>>>>>>>> correct? >>>>>>>> Was following existing clk-tegra-pmc as I am not sure of reason for >>>>>>>> having these clocks registered as separate mux and gate clocks. >>>>>>>> >>>>>>>> Yes, PMC clocks can be registered as single clock and can use >>>>>>>> clk_ops >>>>>>>> for set/get parent and enable/disable. >>>>>>>> >>>>>>>> enable/disable of PMC clocks is for force-enable to force the >>>>>>>> clock to >>>>>>>> run regardless of ACCEPT_REQ or INVERT_REQ. >>>>>>>> >>>>>>>>>>> 4. clk_m_div2/4 are internal PMC OSC dividers and thus these >>>>>>>>>>> clocks >>>>>>>>>>> should belong to PMC. >>>>>>>>>> Also, it should be "osc" and not "clk_m". >>>>>>>>> I followed the same parents as it were in existing clk-tegra-pmc >>>>>>>>> driver. >>>>>>>>> >>>>>>>>> Yeah they are wrong and they should be from osc and not clk_m. >>>>>>>>> >>>>>>>>> Will fix in next version. >>>>>>>>> >>>>> Reg clk_m_div2/3, they are dividers at OSC pad and not really internal >>>>> to PMC block. >>>>> >>>>> current clock driver creates clk_m_div clocks which should actually be >>>>> osc_div2/osc_div4 clocks with osc as parent. >>>>> >>>>> There are no clk_m_div2 and clk_m_div4 from clk_m >>>>> >>>>> Will fix this in next version. >>>>> >>>>>>> Could you please describe the full EXTPERIPH clock topology and >>>>>>> how the >>>>>>> pinmux configuration is related to it all? >>>>>>> >>>>>>> What is internal to the Tegra chip and what are the external >>>>>>> outputs? >>>>>>> >>>>>>> Is it possible to bypass PMC on T30+ for the EXTPERIPH clocks? >>>>>> PMC CLK1/2/3 possible sources are OSC_DIV1, OSC_DIV2, OSC_DIV4, >>>>>> EXTPERIPH from CAR. >>>>>> >>>>>> OSC_DIV1/2/4 are with internal dividers at the OSC Pads >>>>>> >>>>>> EXTPERIPH is from CAR and it has reset and enable controls along with >>>>>> clock source selections to choose one of the PLLA_OUT0, CLK_S, >>>>>> PLLP_OUT0, CLK_M, PLLE_OUT0 >>>>>> >>>>>> So, PMC CLK1/2/4 possible parents are OSC_DIV1, OSC_DIV2, OSC_DIV4, >>>>>> EXTERN. >>>>>> >>>>>> >>>>>> CLK1/2/3 also has Pinmux to route EXTPERIPH output on to these pins. >>>>>> >>>>>> >>>>>> When EXTERN output clock is selected for these PMC clocks thru >>>>>> CLKx_SRC_SEL, output clock is from driver by EXTPERIPH from CAR via >>>>>> Pinmux logic or driven as per CLKx_SRC_SEL bypassing pinmux based on >>>>>> CLKx_ACCEPT_REQ bit. >>>>>> >>>>>> >>>>>> PMC Clock control register has bit CLKx_ACCEPT_REQ >>>>>> When CLKx_ACCEPT_REQ = 0, output clock driver is from by EXTPERIPH >>>>>> through the pinmux >>>>>> When CLKx_ACCEPT_REQ = 1, output clock is based on CLKx_SRC_SEL bits >>>>>> (OSC_DIV1/2/4 and EXTPERIPH clock bypassing the pinmux) >>>>>> >>>>>> FORCE_EN bit in PMC CLock control register forces the clock to run >>>>>> regardless of this. >>>> PMC clock gate is based on the state of CLKx_ACCEPT_REQ and FORCE_EN >>>> like explained above. >>>> >>>> CLKx_ACCEPT_REQ is 0 default and FORCE_EN acts as gate to >>>> enable/disable >>>> EXTPERIPH clock output to PMC CLK_OUT_1/2/3. >>> [and to enable OSC as well] >>> >>>> So I believe we need to register as MUX and Gate rather than as a >>>> single >>>> clock. Please confirm. >>> 1. The force-enabling is applied to both OSC and EXTERN sources of >>> PMC_CLK_OUT_x by PMC at once. >>> >>> 2. Both of PMC's force-enabling and OSC/EXTERN selection is internal >>> to PMC. >>> >>> Should be better to define it as a single "pmc_clk_out_x". I don't see >>> any good reasons for differentiating PMC's Gate from the MUX, it's a >>> single hardware unit from a point of view of the rest of the system. >>> >>> Peter, do you have any objections? >> >> We added fallback option for audio mclk and also added check for >> assigned-clock-parents dt property in audio driver and if its not then >> we do parent init configuration in audio driver. >> >> Current clock driver creates 2 separate clocks clk_out_1_mux and >> clk_out_1 for each pmc clock in clock driver and uses extern1 as >> parent to clk_out_1_mux and clk_out_1_mux is parent to clk_out_1. >> >> With change of registering each pmc clock as a single clock, when we >> do parent init assignment in audio driver when >> assigned-clock-properties are not used in DT (as we removed parent >> inits for extern and clk_outs from clock driver), we should still try >> to get clock based on clk_out_1_mux as parent assignment of extern1 is >> for clk_out_1_mux as per existing clock tree. >> >> clk_out_1_mux clock retrieve will fail with this change of single >> clock when any new platform device tree doesn't specify >> assigned-clock-parents properties and tegra_asoc_utils_init fails. You made the PMC/CaR changes before the audio changes, the clk_out_1_mux won't exist for the audio driver patches. If you care about bisect-ability of the patches, then the clock and audio changes need to be done in a single patch. But I don't think that it's worthwhile. >> With single clock, extern1 is the parent for clk_out_1 and with >> separate clocks for mux and gate, extern1 is the parent for >> clk_out_1_mux. > > If we move to single clock now, it need one more additional fallback > implementation in audio driver during parent configuration as > clk_out_1_mux will not be there with single clock change and old/current > kernel has it as it uses separate clocks for pmc mux and gate. Why additional fallback? Additional to what? > Also, with single clock for both PMC mux and gate now, new DT should use > extern1 as parent to CLK_OUT_1 as CLK_OUT_1_MUX will not be there old > PMC dt-bindings has separate clocks for MUX (CLK_OUT_1_MUX) and gate > (CLK_OUT_1) > > DT bindings will not be compatible b/w old and new changes if we move to > Single PMC clock now. Sorry, I don't understand what you're meaning by the "new changes". > Should we go with same separate clocks to have it compatible to avoid > all this? >

1 0

[alsa-devel] [PATCH for-5.6 00/23] ASoC: PCM API updates (part II)
by Takashi Iwai 11 Dec '19

11 Dec '19

Hi, this is the second part of PCM API updates for ASoC. This one just removes the superfluous PCM ioctl ops (and relevant cleanups). Applicable on top of the previous patch set. thanks, Takashi === Takashi Iwai (23): ASoC: amd: Drop superfluous ioctl PCM ops ASoC: atmel: Drop superfluous ioctl PCM ops ASoC: au1x: Drop superfluous ioctl PCM ops ASoC: bcm: Drop superfluous ioctl PCM ops ASoC: dwc: Drop superfluous ioctl PCM ops ASoC: fsl: Drop superfluous ioctl PCM ops ASoC: intel: Drop superfluous ioctl PCM ops ASoC: kirkwood: Drop superfluous ioctl PCM ops ASoC: mediatek: Drop superfluous ioctl PCM ops ASoC: meson: Drop superfluous ioctl PCM ops ASoC: pxa: Drop superfluous ioctl PCM ops ASoC: qcom: Drop superfluous ioctl PCM ops ASoC: samsung: Drop superfluous ioctl PCM ops ASoC: sh: Drop superfluous ioctl PCM ops ASoC: generic-dmaengine: Drop superfluous ioctl PCM ops ASoC: SOF: Drop superfluous ioctl PCM ops ASoC: sprd: Drop superfluous ioctl PCM ops ASoC: txx9: Drop superfluous ioctl PCM ops ASoC: uniphier: Drop superfluous ioctl PCM ops ASoC: xilinx: Drop superfluous ioctl PCM ops ASoC: xtensa: Drop superfluous ioctl PCM ops ASoC: utils: Drop superfluous ioctl PCM ops ASoC: Drop snd_soc_pcm_lib_ioctl() include/sound/soc.h | 5 ----- sound/soc/amd/acp-pcm-dma.c | 1 - sound/soc/amd/raven/acp3x-pcm-dma.c | 1 - sound/soc/atmel/atmel-pcm-pdc.c | 1 - sound/soc/au1x/dbdma2.c | 1 - sound/soc/au1x/dma.c | 1 - sound/soc/bcm/cygnus-pcm.c | 1 - sound/soc/dwc/dwc-pcm.c | 1 - sound/soc/fsl/fsl_asrc_dma.c | 1 - sound/soc/fsl/fsl_dma.c | 1 - sound/soc/fsl/imx-pcm-fiq.c | 1 - sound/soc/fsl/mpc5200_dma.c | 1 - sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 - sound/soc/intel/baytrail/sst-baytrail-pcm.c | 1 - sound/soc/intel/haswell/sst-haswell-pcm.c | 1 - sound/soc/intel/skylake/skl-pcm.c | 1 - sound/soc/kirkwood/kirkwood-dma.c | 1 - sound/soc/mediatek/common/mtk-afe-platform-driver.c | 1 - sound/soc/mediatek/common/mtk-btcvsd.c | 1 - sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 1 - sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 1 - sound/soc/meson/axg-frddr.c | 3 --- sound/soc/meson/axg-toddr.c | 3 --- sound/soc/pxa/mmp-pcm.c | 1 - sound/soc/pxa/pxa-ssp.c | 1 - sound/soc/pxa/pxa2xx-ac97.c | 1 - sound/soc/pxa/pxa2xx-i2s.c | 1 - sound/soc/pxa/pxa2xx-pcm.c | 1 - sound/soc/qcom/lpass-platform.c | 1 - sound/soc/qcom/qdsp6/q6asm-dai.c | 1 - sound/soc/samsung/idma.c | 1 - sound/soc/sh/dma-sh7760.c | 1 - sound/soc/sh/fsi.c | 1 - sound/soc/sh/rcar/core.c | 1 - sound/soc/sh/siu_pcm.c | 1 - sound/soc/soc-core.c | 12 ------------ sound/soc/soc-generic-dmaengine-pcm.c | 2 -- sound/soc/soc-utils.c | 1 - sound/soc/sof/pcm.c | 1 - sound/soc/sprd/sprd-pcm-dma.c | 1 - sound/soc/txx9/txx9aclc.c | 1 - sound/soc/uniphier/aio-dma.c | 1 - sound/soc/xilinx/xlnx_formatter_pcm.c | 1 - sound/soc/xtensa/xtfpga-i2s.c | 1 - 44 files changed, 64 deletions(-) -- 2.16.4

7 58

[alsa-devel] [PATCH for-5.6 00/23] ASoC: PCM API updates (part I)
by Takashi Iwai 11 Dec '19

11 Dec '19

Hi, this is a patch set to adapt the recent PCM API updates to ASoC drivers. This is the first half of the whole changes, just for updating the buffer allocation code with the new API. There should be no functional changes. The ASoC core changes are already found in 5.5-rc1, so please merge these onto 5.5-rc1 or later branch. Or I can merge through my tree, too, just let me know. thanks, Takashi === Takashi Iwai (23): ASoC: amd: Use managed buffer allocation ASoC: au1x: Use managed buffer allocation ASoC: dwc: Use managed buffer allocation ASoC: mediatek: Use managed buffer allocation ASoC: meson: Use managed buffer allocation ASoC: dma-sh7760: Use managed buffer allocation ASoC: fsi: Use managed buffer allocation ASoC: rcar: Use managed buffer allocation ASoC: siu_pcm: Use managed buffer allocation ASoC: generic-dmaengine-pcm: Use managed buffer allocation ASoC: SOF: Use managed buffer allocation ASoC: stm32: Use managed buffer allocation ASoC: txx9: Use managed buffer allocation ASoC: uniphier: Use managed buffer allocation ASoC: xilinx: Use managed buffer allocation ASoC: xtensa: Use managed buffer allocation ASoC: cros_ec_codec: Use managed buffer allocation ASoC: rt5514-spi: Use managed buffer allocation ASoC: rt5677-spi: Use managed buffer allocation ASoC: intel: atom: Use managed buffer allocation ASoC: intel: baytrail: Use managed buffer allocation ASoC: intel: haswell: Use managed buffer allocation ASoC: intel: skylake: Use managed buffer allocation sound/soc/amd/acp-pcm-dma.c | 58 ++++++++-------------- sound/soc/amd/raven/acp3x-pcm-dma.c | 30 +++-------- sound/soc/au1x/dbdma2.c | 14 +----- sound/soc/au1x/dma.c | 21 +++----- sound/soc/codecs/cros_ec_codec.c | 8 +-- sound/soc/codecs/rt5514-spi.c | 10 ++-- sound/soc/codecs/rt5677-spi.c | 10 ++-- sound/soc/dwc/dwc-pcm.c | 24 +-------- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 25 +--------- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 19 +------ sound/soc/intel/haswell/sst-haswell-pcm.c | 17 +------ sound/soc/intel/skylake/skl-pcm.c | 26 +++------- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 14 +----- sound/soc/mediatek/common/mtk-afe-fe-dai.h | 2 - .../soc/mediatek/common/mtk-afe-platform-driver.c | 12 +---- .../soc/mediatek/common/mtk-afe-platform-driver.h | 2 - sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 - sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 1 - sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 1 - sound/soc/meson/axg-fifo.c | 13 ++--- sound/soc/sh/dma-sh7760.c | 14 +----- sound/soc/sh/fsi.c | 18 +------ sound/soc/sh/rcar/core.c | 23 +++------ sound/soc/sh/siu_pcm.c | 39 +-------------- sound/soc/soc-generic-dmaengine-pcm.c | 12 +---- sound/soc/sof/pcm.c | 34 ++++--------- sound/soc/stm/stm32_adfsdm.c | 29 +---------- sound/soc/txx9/txx9aclc.c | 14 +----- sound/soc/uniphier/aio-dma.c | 30 +---------- sound/soc/xilinx/xlnx_formatter_pcm.c | 13 +---- sound/soc/xtensa/xtfpga-i2s.c | 9 ++-- 31 files changed, 93 insertions(+), 451 deletions(-) -- 2.16.4

3 47

[alsa-devel] [PATCH] ASoC: soc-core: merge soc_set_name_prefix() and soc_set_of_name_prefix()
by Kuninori Morimoto 11 Dec '19

11 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> soc_set_name_prefix() is calling soc_set_of_name_prefix(). We don't need to separate these operation. This patch merges these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 750469a..f8090bd 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1206,22 +1206,12 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, return ret; } -static void soc_set_of_name_prefix(struct snd_soc_component *component) -{ - struct device_node *of_node = soc_component_to_node(component); - const char *str; - int ret; - - ret = of_property_read_string(of_node, "sound-name-prefix", &str); - if (!ret) - component->name_prefix = str; -} - static void soc_set_name_prefix(struct snd_soc_card *card, struct snd_soc_component *component) { struct device_node *of_node = soc_component_to_node(component); - int i; + const char *str; + int ret, i; for (i = 0; i < card->num_configs; i++) { struct snd_soc_codec_conf *map = &card->codec_conf[i]; @@ -1238,7 +1228,11 @@ static void soc_set_name_prefix(struct snd_soc_card *card, * If there is no configuration table or no match in the table, * check if a prefix is provided in the node */ - soc_set_of_name_prefix(component); + ret = of_property_read_string(of_node, "sound-name-prefix", &str); + if (ret < 0) + return; + + component->name_prefix = str; } static void soc_remove_component(struct snd_soc_component *component, -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: soc-core: tidyup for CONFIG_DMI
by Kuninori Morimoto 11 Dec '19

11 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> soc-core.c has 2 #ifdef CONFIG_DMI, but we can merge these. OTOH, soc.h has dmi_longname, but it is needed if CONFIG_DMI was defined. In other words, It is not needed if CONFIG_DMI was not defined. This patch tidyup these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 32 +++++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index c920f17..a6a3a7d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -986,7 +986,9 @@ struct snd_soc_card { const char *long_name; const char *driver_name; const char *components; +#ifdef CONFIG_DMI char dmi_longname[80]; +#endif /* CONFIG_DMI */ char topology_shortname[32]; struct device *dev; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f8090bd..51a404f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -73,23 +73,6 @@ static int pmdown_time = 5000; module_param(pmdown_time, int, 0); MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)"); -#ifdef CONFIG_DMI -/* - * If a DMI filed contain strings in this blacklist (e.g. - * "Type2 - Board Manufacturer" or "Type1 - TBD by OEM"), it will be taken - * as invalid and dropped when setting the card long name from DMI info. - */ -static const char * const dmi_blacklist[] = { - "To be filled by OEM", - "TBD by OEM", - "Default String", - "Board Manufacturer", - "Board Vendor Name", - "Board Product Name", - NULL, /* terminator */ -}; -#endif - static ssize_t pmdown_time_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1608,6 +1591,21 @@ EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt); #ifdef CONFIG_DMI /* + * If a DMI filed contain strings in this blacklist (e.g. + * "Type2 - Board Manufacturer" or "Type1 - TBD by OEM"), it will be taken + * as invalid and dropped when setting the card long name from DMI info. + */ +static const char * const dmi_blacklist[] = { + "To be filled by OEM", + "TBD by OEM", + "Default String", + "Board Manufacturer", + "Board Vendor Name", + "Board Product Name", + NULL, /* terminator */ +}; + +/* * Trim special characters, and replace '-' with '_' since '-' is used to * separate different DMI fields in the card long name. Only number and * alphabet characters and a few separator characters are kept. -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: soc-core: tidyup for CONFIG_DEBUG_FS
by Kuninori Morimoto 11 Dec '19

11 Dec '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> soc-core.c has 2 #ifdef CONFIG_DEBUG_FS, but we can merge these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 51a404f..3eb874c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -45,11 +45,6 @@ #define NAME_SIZE 32 -#ifdef CONFIG_DEBUG_FS -struct dentry *snd_soc_debugfs_root; -EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); -#endif - static DEFINE_MUTEX(client_mutex); static LIST_HEAD(component_list); static LIST_HEAD(unbind_card_list); @@ -133,6 +128,9 @@ static const struct attribute_group *soc_dev_attr_groups[] = { }; #ifdef CONFIG_DEBUG_FS +struct dentry *snd_soc_debugfs_root; +EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); + static void soc_init_component_debugfs(struct snd_soc_component *component) { if (!component->card->debugfs_card_root) -- 2.7.4

2 1

[alsa-devel] [PATCH v4 00/11] soundwire: update ASoC interfaces
by Pierre-Louis Bossart 11 Dec '19

11 Dec '19

We need new fields in existing structures to a) deal with race conditions on codec probe/enumeration b) allow for multi-step ACPI scan/probe/startup on Intel plaforms c) deal with MSI issues using a single handler/threads for all audio interrupts d) deal with access to registers shared across multiple links on Intel platforms These structures for a) will be used by the SOF driver as well as codec drivers. The b) c) and d) cases are only for the Intel-specific implementation. To avoid conflicts between ASoC and Soundwire trees, these 11 patches are provided out-of-order, before the functionality enabled in these header files is added in follow-up patch series which can be applied separately in the ASoC and Soundwire trees. As discussed earlier, Vinod would need to provide an immutable tag for Mark Brown, and the integration on the ASoC side of SOF changes and new codecs drivers can proceed in parallel with SoundWire core changes. I had multiple offline discussions with Vinod/Mark/Takashi on how to proceed withe volume of SoundWire changes. Now that v5.5-rc1 is out we should go ahead with these interface changes. The next patchset has not changed, the series "[PATCH v3 00/15] soundwire: intel: implement new ASoC interfaces" can still be reviewed. An update for the series "[PATCH v3 00/22] soundwire: code hardening and suspend-resume support" will be provided later this week (one last minute issue to fix) Comments and feedback welcome ~Pierre Changes since v3: Reordered code and added kernel doc comments Added prototypes and fields needed to deal with SoundWire interrupts in a single handler/thread, following what is already done on the DSP side. Added mutex to control access to registers shared across links Added initial definitions for clock stop support on Intel platforms. Depending on power and latency requirements, different "quirks" can be supported. Changes since v2: Added new field to deal with a race condition leading to a timeout when the codec goes through a pm_runtime suspend/resume transition while the Master remains active. Clarified commit messages with detailed explanations what those race conditions are and why the changes were introduced. Reordered fields for Intel routines Added kernel-doc definitions for structures Modified the patch subjects to make the mapping between interface definition and implementation straightforward. Changes since v1 (no feedback received since October 23) additional initialization_complete utility to help codec drivers with their resume operation, waiting for the enumeration to complete is not always enough. Bard Liao (2): soundwire: intel: update headers for interrupts soundwire: intel: add link_list to handle interrupts with a single thread Pierre-Louis Bossart (7): soundwire: sdw_slave: add probe_complete structure and new fields soundwire: sdw_slave: add enumeration_complete structure soundwire: sdw_slave: add initialization_complete definition soundwire: sdw_slave: track unattach_request to handle all init sequences soundwire: intel: update interfaces between ASoC and SoundWire soundwire: intel: add mutex for shared SHIM register access soundwire: intel: add clock stop quirks Rander Wang (2): soundwire: intel: update stream callbacks for hwparams/free stream operations soundwire: intel: add prototype for WAKEEN interrupt processing drivers/soundwire/intel.c | 20 ++-- drivers/soundwire/intel.h | 13 ++- drivers/soundwire/intel_init.c | 31 ++---- include/linux/soundwire/sdw.h | 19 ++++ include/linux/soundwire/sdw_intel.h | 154 ++++++++++++++++++++++++++-- 5 files changed, 194 insertions(+), 43 deletions(-) base-commit: e42617b825f8073569da76dc4510bfa019b1c35a -- 2.20.1

2 13

Re: [alsa-devel] [v6, 5/6] ASoC: sgtl5000: Fix of unmute outputs on probe
by Alison Wang 11 Dec '19

11 Dec '19

Hi, Oleksandr, I have a question about this patch. Could you give me some ideas? Thanks. In this patch, snd_soc_component_update_bits is used instead of snd_soc_component_write. Although EN_HP_ZCD and EN_ADC_ZCD are enabled in ANA_CTRL register, MUTE_LO, MUTE_HP and MUTE_ADC bits are remained as the default value. It causes LO, HP and ADC are all muted after driver probe. BTW, in the original code, snd_soc_component_write is used and MUTE_LO, MUTE_HP and MUTE_ADC are all set as zero (unmute). I saw the above phenomenon on the latest linux-next. For LO and HP are muted, no sound can be heard. Best Regards, Alison Wang > Subject: [v6,5/6] ASoC: sgtl5000: Fix of unmute outputs on probe > > To enable "zero cross detect" for ADC/HP, change HP_ZCD_EN/ADC_ZCD_EN > bits only instead of writing the whole CHIP_ANA_CTRL register. > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> > Reviewed-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> > Reviewed-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> > Reviewed-by: Fabio Estevam <festevam(a)gmail.com> > > --- > > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: > - Fix patch formatting > > sound/soc/codecs/sgtl5000.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > > diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index > b65232521ea8..23f4ae2f0723 100644 > --- a/sound/soc/codecs/sgtl5000.c > +++ b/sound/soc/codecs/sgtl5000.c > @@ -1453,6 +1453,7 @@ static int sgtl5000_probe(struct > snd_soc_component *component) > int ret; > u16 reg; > struct sgtl5000_priv *sgtl5000 = > snd_soc_component_get_drvdata(component); > + unsigned int zcd_mask = SGTL5000_HP_ZCD_EN | > SGTL5000_ADC_ZCD_EN; > > /* power up sgtl5000 */ > ret = sgtl5000_set_power_regs(component); > @@ -1480,9 +1481,8 @@ static int sgtl5000_probe(struct > snd_soc_component *component) > 0x1f); > snd_soc_component_write(component, SGTL5000_CHIP_PAD_STRENGTH, > reg); > > - snd_soc_component_write(component, SGTL5000_CHIP_ANA_CTRL, > - SGTL5000_HP_ZCD_EN | > - SGTL5000_ADC_ZCD_EN); > + snd_soc_component_update_bits(component, > SGTL5000_CHIP_ANA_CTRL, > + zcd_mask, zcd_mask); > > snd_soc_component_update_bits(component, > SGTL5000_CHIP_MIC_CTRL, > SGTL5000_BIAS_R_MASK, >

1 0

[alsa-devel] [PATCH] ALSA: hda/realtek - Line-out jack doesn't work on a Dell AIO
by Hui Wang 11 Dec '19

11 Dec '19

After applying the fixup ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, the Line-out jack works well. And instead of adding a new set of pin definition in the pin_fixup_tbl, we put a more generic matching entry in the fallback_pin_fixup_tbl. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6d6e34b3b3aa..dbfafee97931 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7643,11 +7643,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1a, 0x90a70130}, {0x1b, 0x90170110}, {0x21, 0x03211020}), - SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, - {0x12, 0xb7a60130}, - {0x13, 0xb8a61140}, - {0x16, 0x90170110}, - {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, {0x12, 0x90a60130}, {0x14, 0x90170110}, @@ -7841,6 +7836,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = { SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x19, 0x40000000}, {0x1a, 0x40000000}), + SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, + {0x19, 0x40000000}, + {0x1a, 0x40000000}), {} }; -- 2.17.1

2 1

[alsa-devel] [alsa-lib][PATCH] ucm: setup conf_format after getting ALSA_CONFIG_UCM_VAR successfully
by libin.yang＠linux.intel.com 11 Dec '19

11 Dec '19

From: Libin Yang <libin.yang(a)linux.intel.com> Set the conf_format to 1 after getting ALSA_CONFIG_UCM_VAR successfully. Otherwise, the conf_format is not set in this scenario. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- src/ucm/parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index ba50027..d61124a 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -89,6 +89,8 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr, env = getenv(ALSA_CONFIG_UCM2_VAR); if (env == NULL) { env = getenv(ALSA_CONFIG_UCM_VAR); + if (env) + uc_mgr->conf_format = 1; } else { uc_mgr->conf_format = 2; } -- 2.7.4

1 0