- 12 Nov, 2020 15 commits
-
-
Mark Brown authored
Merge series "ASoC: soundwire: SDCA device quirk and cleanups" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Add one quirk to handle new TigerLake-SDCA device and cleanup code. Pierre-Louis Bossart (4): ASoC: Intel: sof_sdw: add quirk for new TigerLake-SDCA device ASoC: codecs: rt*.c: remove useless pointer cast ASoC: rt711: remove warnings ASoC: codecs: max98373-sdw: align regmap use with other codecs sound/soc/codecs/max98373-sdw.c | 2 +- sound/soc/codecs/rt1308-sdw.c | 2 +- sound/soc/codecs/rt5682-sdw.c | 2 +- sound/soc/codecs/rt700.c | 2 +- sound/soc/codecs/rt711-sdw.c | 15 ++++++++------- sound/soc/codecs/rt711.c | 2 +- sound/soc/codecs/rt715.c | 2 +- sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ 8 files changed, 24 insertions(+), 13 deletions(-) -- 2.25.1
-
Mark Brown authored
The first patch fixed a wrong free in wm8997_probe. The remaining three patches fixed PM disable depth imbalance on error handling. Zhang Qilong (4): ASoC: arizona: Fix a wrong free in wm8997_probe ASoC: arizona: Fix PM disable depth imbalance on error ASoC: wm8994: Fix PM disable depth imbalance on error ASoC: wm8998: Fix PM disable depth imbalance on error sound/soc/codecs/wm8994.c | 6 +++++- sound/soc/codecs/wm8997.c | 8 ++++++-- sound/soc/codecs/wm8998.c | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) -- 2.25.4
-
Fabio Estevam authored
The imx-ssi driver was only used by i.MX non-DT platforms. Since 5.10-rc1, i.MX has been converted to a DT-only platform and all board files are gone. Remove the imx-ssi audio driver as there are no more users at all. Signed-off-by:
Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/r/20201110203937.25684-6-festevam@gmail.comSigned-off-by:
Mark Brown <broonie@kernel.org>
-
Fabio Estevam authored
SND_SOC_IMX_SSI was only used by i.MX non-DT platforms. SND_SOC_EUKREA_TLV320 already selects the SND_SOC_FSL_SSI symbol, which is enough. Remove the unneeded SND_SOC_IMX_SSI selection. Signed-off-by:
-
Fabio Estevam authored
The imx-mc13783 was used on imx27-pdk and imx31-pdk non-DT platforms. Since 5.10-rc1, i.MX has been converted to a DT-only platform and all board files are gone. Remove the imx-mc13783 audio machine driver as there is no user at all. Signed-off-by:
-
Fabio Estevam authored
Since commit e1324ece ("ARM: imx: Remove i.MX35 board files"), the MACH_PCM043 and MACH_PCA100 non-DT platform are no longer supported, so get rid of their machine audio driver too. Signed-off-by:
-
Fabio Estevam authored
Since commit 879c0e5e ("ARM: imx: Remove i.MX27 board files"), the MACH_IMX27_VISSTRIM_M10 non-DT platform is no longer supported, so get rid of its machine audio driver too. Signed-off-by:
-
Fabio Estevam authored
Since commit c93197b0 ("ARM: imx: Remove i.MX31 board files"), the MACH_MX31ADS_WM1133_EV1 non-DT platform is no longer supported, so get rid of its machine audio driver too. Signed-off-by:
-
Kai Vehmanen authored
The firmware extended data IPC and manifest structures are designed to be extendable without breaking the driver-firmware ABI. Driver should not raise a warning in case a new header type is detected at firmware boot. There are already checks for IPC ABI compatibility in snd_sof_ipc_valid() and if the versions are deemed compatible, extra fields in IPC messages should not trigger warnings. Signed-off-by:
Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by:
Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by:
Karol Trzciński <karolx.trzcinski@linux.intel.com> Link: https://lore.kernel.org/r/20201111173321.1933452-1-kai.vehmanen@linux.intel.comSigned-off-by:
-
Dharageswari R authored
Smart_amp_speaker device has the playback stream and capture stream associated to it. Hence add the dpcm_capture = 1 flag while dailink creation. This patches fixes: ERR kernel [timestamp] SSP1-Codec: ASoC: no backend capture stream Reviewed-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by:
Dharageswari R <dharageswari.r@intel.com> Signed-off-by:
-
Pierre-Louis Bossart authored
It's not clear why this driver has an additional call to regmap_mark_dirty(), remove to align with others. Signed-off-by:
Rander Wang <rander.wang@linux.intel.com> Reviewed-by:
Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20201111214318.150529-5-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
cppcheck complains, use separate loop variable for sink and source ports sound/soc/codecs/rt711-sdw.c:382:4: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment] i = 0; ^ sound/soc/codecs/rt711-sdw.c:371:4: note: i is assigned i++; ^ sound/soc/codecs/rt711-sdw.c:382:4: note: i is overwritten i = 0; ^ Signed-off-by:
-
Pierre-Louis Bossart authored
Pointer cast is not necessary, remove. Signed-off-by:
-
Pierre-Louis Bossart authored
Add quirks for jack detection, rt715 DAI and number of speakers. Signed-off-by:
-
Zhang Qilong authored
In the normal path, we should not free the arizona, we should return immediately. It will be free when call remove operation. Fixes: 31833ead ("ASoC: arizona: Move request of speaker IRQs into bus probe") Reported-by:
Richard Fitzgerald <rf@opensource.cirrus.com> Signed-off-by:
Zhang Qilong <zhangqilong3@huawei.com> Acked-by:
-
- 11 Nov, 2020 6 commits
-
-
Mark Brown authored
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. This series of patches fixed it. Zhang Qilong (3): ASoC: wm8994: Fix PM disable depth imbalance on error ASoC: wm8997: Fix PM disable depth imbalance on error ASoC: wm8998: Fix PM disable depth imbalance on error sound/soc/codecs/wm8994.c | 6 +++++- sound/soc/codecs/wm8997.c | 9 +++++++-- sound/soc/codecs/wm8998.c | 4 +++- 3 files changed, 15 insertions(+), 4 deletions(-) -- 2.25.4
-
Jiaxin Yu authored
We can choose to drop away any length of data from the beginning according to project needs. Some projects don't want to throw away any data, because they want to use recorded data to do echo cancellation, so they have to make sure that they are aligned with the reference data as much as possible. Or there are other algorithms in the upper layer to eliminate this noise. Or some projects want to eliminate this noise form the kernel layer. However, the minimum recommended value is 50ms to skip pop noise. Signed-off-by:
Jiaxin Yu <jiaxin.yu@mediatek.com> Link: https://lore.kernel.org/r/1605062722-8711-1-git-send-email-jiaxin.yu@mediatek.comSigned-off-by:
-
Shane.Chien authored
remove mt6359_platform_driver_remove due to it is useless. Signed-off-by:
Shane.Chien <shane.chien@mediatek.com> Link: https://lore.kernel.org/r/1605068096-12587-1-git-send-email-shane.chien@mediatek.comSigned-off-by:
-
Jon Hunter authored
Deferred probe is an expected return value for snd_soc_register_card(). Given that the driver deals with it properly, there's no need to output a warning that may potentially confuse users. Signed-off-by:
Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20201111103245.152189-1-jonathanh@nvidia.comSigned-off-by:
-
Zhang Qilong authored
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. Fixes: 31833ead ("ASoC: arizona: Move request of speaker IRQs into bus probe") Signed-off-by:
-
Zhang Qilong authored
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. Fixes: 57e265c8 ("ASoC: wm8994: Move runtime PM init to platform device init") Signed-off-by:
-
- 10 Nov, 2020 19 commits
-
-
Mark Brown authored
This series is a prepraration for using generic graph driver for Tegra210 audio. Tegra audio graph series will be sent in a separate series because it has some dependency over other series for documentation work. This series can focus on the generic ASoC driver updates. Below are the summary of changes done. * Support multiple instances of a component. For example there can be multiple I2S devices which can use the same component driver. * Support open platforms with empty Codec endpoint. Customers can plug their own HW and can populate codec endpoint. * In a component model there can be many components which can be connected together. In such cases Identify no-pcm DPCM DAI links which can be used in BE<->BE connections. * Expose structures or helpers to be re-used by other similar graph drivers. The series is based on following references where DPCM usgae for Tegra Audio and simple-card driver proposal were discussed. * https://lkml.org/lkml/2020/4/30/519 (DPCM for Tegra) * https://lkml.org/lkml/2020/6/27/4 (simple-card driver) Changelog ========= v4 -> v5 -------- * No changes in the core/audio-graph driver patches which are part of the current series. * Dropped Tegra audio patches and doc patches. This will be sent separately once the doc depdendencies are resolved. v3 -> v4 -------- * Added new patches to convert graph.txt and audio-graph-card.txt to corresponding json-schema files. Later these references are used in Tegra audio graph schema. * AHUB component binding docs are updated to reflect the usage of ports/port/endpoint * More common stuff is moved into graph_parse_of() and this is used by both generic and Tegra audio graph. * DT binding for Tegra audio graph is updated to included "ports { }" * As per the suggestion 'void *data' member is dropped from 'asoc_simple_priv' and instead container method is used to maintain required custom data internal to Tegra audio graph. v2 -> v3 -------- * Dropped new compatible addition in generic graph driver after reviewing it with Morimoto-san. Instead added Tegra audio graph driver and new compatibles are added in the same. * Added new patches to expose new members for customization in audio graph driver. * Added new patch for Tegra audio graph driver and related documentation. * Minor change in below commit where mutex version of helper is used "ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM" * DT binding is updated to use the newly exposed compatibles * No changes in other patches v1 -> v2 -------- * Re-organized ports/endpoints description for ADMAIF and XBAR. Updated DT patches accordingly. * After above change, multiple Codec endpoint support is not required and hence dropped for now. This will be considered separately if at all required in future. * Re-ordered patches in the series. Sameer Pujar (7): ASoC: soc-core: Fix component name_prefix parsing ASoC: soc-pcm: Get all BEs along DAPM path ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names ASoC: audio-graph: Identify 'no_pcm' DAI links for DPCM ASoC: audio-graph: Support empty Codec endpoint ASoC: audio-graph: Expose new members for asoc_simple_priv ASoC: audio-graph: Expose helpers from audio graph include/sound/graph_card.h | 16 ++++ include/sound/simple_card_utils.h | 3 + include/sound/soc.h | 1 + sound/soc/generic/audio-graph-card.c | 175 ++++++++++++++++++++++++----------- sound/soc/soc-core.c | 3 +- sound/soc/soc-pcm.c | 3 +- 6 files changed, 143 insertions(+), 58 deletions(-) create mode 100644 include/sound/graph_card.h -- 2.7.4
-
Dan Carpenter authored
There are two issues in this function. 1) We can't drop the refrences on "cpu", "codec" and "platform" before we take the reference. This doesn't cause a problem on the first iteration because those pointers start as NULL so the of_node_put() is a no-op. But on the subsequent iterations, it will lead to a use after free. 2) If the devm_kzalloc() allocation failed then the code returned directly instead of cleaning up. Fixes: c1e6414c ("ASoC: qcom: common: Fix refcount imbalance on error") Fixes: 1e36ea36 ("ASoC: qcom: common: use modern dai_link style") Signed-off-by:
Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/20201105125154.GA176426@mwandaSigned-off-by:
-
Viorel Suman authored
The break condition copied by mistake as same as loop condition in the previous version, but must be the opposite. So fix it. Signed-off-by:
Viorel Suman <viorel.suman@nxp.com> Link: https://lore.kernel.org/r/20201102161810.902464-1-viorel.suman@oss.nxp.comSigned-off-by:
-
Sameer Pujar authored
This commit exposes following functions which can be used by a sound card driver based on generic audio graph driver. Idea is vendors can have a thin driver and re-use common stuff from audio graph driver. - graph_card_probe() - graph_parse_of() In doing so a new header file is added for above. The graph_probe() function is simplified by moving more common stuff to graph_parse_of(). Signed-off-by:
Sameer Pujar <spujar@nvidia.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/1604329814-24779-8-git-send-email-spujar@nvidia.comSigned-off-by:
-
Sameer Pujar authored
Add new members in struct 'asoc_simple_priv'. Idea is to leverage simple or graph card driver as much as possible and vendor can maintain a thin driver to control the behavior by populating these newly exposed members. Following are the members added in 'asoc_simple_priv': - 'ops' struct: In some cases SoC vendor drivers may want to implement 'snd_soc_ops' callbacks differently. In such cases custom callbacks would be used. - 'force_dpcm' flag: Right now simple or graph card drivers detect DAI links as DPCM links if: * The dpcm_selectable is set AND * Codec is connected to multiple CPU endpoints or aconvert property is used for rate/channels. So there is no way to directly specify usage of DPCM alone. So a flag is exposed to mark all links as DPCM. Vendor driver can set this if required. - 'dpcm_selectable': Currently simple or audio graph drivers provide a way to enable this for specific compatibles. However vendor driver may want to define some additional info. Thus expose this variable where vendor drivers can set this if required. Audio graph driver is updated to consider above flags or callbacks. Subsequent patches in the series illustrate usage for above. Signed-off-by: -
Sameer Pujar authored
For open platforms, which can support pluggable audio cards, Codec endpoint is not fixed always. It actually depends on the compatible HW module that is going to be connected. From SoC side the given I/O interface is always available. Hence such links have fixed CPU endpoint but no Codec endpoint. This patch helps to support such links where user can populate Codec endpoint only and its fields in Platform DT depending on the plugged HW. Signed-off-by:
-
Sameer Pujar authored
PCM devices are created for FE dai links with 'no-pcm' flag as '0'. Such DAI links have CPU component which implement either pcm_construct() or pcm_new() at component or dai level respectively. Based on this, current patch exposes a helper function to identify such components and populate 'no_pcm' flag for DPCM DAI link. This helps to have BE<->BE component links where PCM devices need not be created for CPU component involved in such links. Signed-off-by:
-
Sameer Pujar authored
For multiple instances of components, using DAI name alone for DAI links is causing conflicts. Components can define multiple DAIs and hence using just a device name won't help either. Thus DT device node reference and DAI names are used to uniquely represent DAI link names. Signed-off-by:
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/1604329814-24779-4-git-send-email-spujar@nvidia.comSigned-off-by:
-
Sameer Pujar authored
dpcm_end_walk_at_be() stops the graph walk when first BE is found for the given FE component. In a component model we may want to connect multiple DAIs from different components. A new flag is introduced in 'snd_soc_card', which when set allows DAI/component chaining. Later PCM operations can be called for all these listed components for a valid DAPM path. Signed-off-by:
-
Sameer Pujar authored
The "prefix" can be defined in DAI link node or it can be specified as part of the component node itself. Currently "sound-name-prefix" defined in a component is not taking effect. Actually the property is not getting parsed. It can be fixed by parsing "sound-name-prefix" property whenever "prefix" is missing in DAI link Codec node. Signed-off-by:
-
Mark Brown authored
Merge series "Modify documentation and machine driver for SC7180 sound card" from Ajye Huang <ajye.huang@gmail.com>: Note: - The patch is made by the collaboration of Ajye Huang <ajye_huang@compal.corp-partner.google.com> Cheng-Yi Chiang <cychiang@chromium.org> v6: - Documentation: Addressed suggestions from Rob Herring. - Define "maxItems: 1" in dmic-gpios property. - Only keep one example and add dmic-gpios property in. v5: - Machine driver: - Fix a format string warning (Reported-by: kernel test robot <lkp@intel.com>). detailed info at https://lore.kernel.org/patchwork/patch/1331087/ v4: - Machine driver: Addressed suggestions from Tzung-Bi. - Remove redundant judgments in dmic_set() and dmic_get(). - Remove 1 level indent of judgment of IS_ERR(data->dmic_sel). v3: - Machine driver: Addressed suggestions from Tzung-Bi. - Move variables "dmic_switch" and "dmic_sel" into struct sc7180_snd_data. - Remove redundant judgments in dmic_set(). v2: - Documentation: Modify the dimc-gpios property description and examples. - Machine driver: - Remove "qcom,sc7180-sndcard-rt5682-m98357-2mic" compatible - See gpio property and use anadditional control. Thanks for the review! Ajye Huang (2): ASoC: google: dt-bindings: modify machine bindings for two MICs case ASoC: qcom: sc7180: Modify machine driver for 2mic .../bindings/sound/google,sc7180-trogdor.yaml | 8 ++- sound/soc/qcom/sc7180.c | 61 +++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) -- 2.25.1 -
Mark Brown authored
"Shane.Chien" <shane.chien@mediatek.com>: From: "Shane.Chien" <shane.chien@mediatek.com> This series of patches is to fix vaud18 power leakage problem. vaud18 will be enable only when mt6359 audio path is turned on. Change since v2: - fix dt-binnding syntex error Change since v1: - use dapm regulator supply widget for vaud18 control. - add vaud18 regulator property in mt6359 dt-binding. Shane.Chien (2): ASoC: Fix vaud18 power leakage of mt6359 dt-bindings: mediatek: mt6359: Add new property for mt6359 .../devicetree/bindings/sound/mt6359.yaml | 9 +++++++ sound/soc/codecs/mt6359.c | 25 +------------------- sound/soc/codecs/mt6359.h | 8 ------- 3 files changed, 10 insertions(+), 32 deletions(-) -- 1.7.9.5
-
Mark Brown authored
Merge series "ASoC: soc-compress: tidyup STREAM vs COMPRESS" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>: Hi Mark These are v2 of tidyup patch-set for SNDRV_PCM_STREAM_xxx and SND_COMPRESS_xxx. soc-compress is using both SNDRV_PCM_STREAM_xxx and SND_COMPRESS_xxx, but mixed use. This is confusable, but no problem. Because these are defined as UAPI and are using same value. This patch-set make sure these are same value. v1 -> v2 - checks COMPRESS vs PCM_STREAM by using BUILD_BUG_ON() Link: https://lore.kernel.org/r/87wnzcfnkk.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (2): ASoC: soc-compress: tidyup STREAM vs COMPRESS ASoC: soc-compress: assume SNDRV_PCM_STREAM_xxx and SND_COMPRESS_xxx are same sound/soc/soc-compress.c | 63 +++++++++++++++------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) -- 2.25.1
-
David Lin authored
This patch is to revise the power event of EN_PIN dapm widget for symmetry. Signed-off-by:
David Lin <CTLIN0@nuvoton.com> Link: https://lore.kernel.org/r/20201110095823.3512447-1-CTLIN0@nuvoton.comSigned-off-by:
-
David Lin authored
Add codec driver for Nuvoton NAU8315. Signed-off-by:
-
Kuninori Morimoto authored
soc-compress.c is using both SND_COMPRESS_xxx and SND_PCM_STREAM_xxx. These are defined as UAPI, and has same value. enum { SNDRV_PCM_STREAM_PLAYBACK = 0, SNDRV_PCM_STREAM_CAPTURE, ... }; enum snd_compr_direction { SND_COMPRESS_PLAYBACK = 0, SND_COMPRESS_CAPTURE }; Essentially both COMPRESS and PCM_STREAM definitions are identical, and can be never different because of ABI compatibility, which means it's safe to mix both variants in the code. This patch checks it by BUILD_BUG_ON(), and merge to use. Signed-off-by: -
Kuninori Morimoto authored
snd_soc_runtime_activate() and snd_soc_dai_digital_mute() need SNDRV_PCM_STREAM_xxx instead of SND_COMPRESS_xxx. These are bug but nothing happen because these are same value. enum { SNDRV_PCM_STREAM_PLAYBACK = 0, SNDRV_PCM_STREAM_CAPTURE, ... }; enum snd_compr_direction { SND_COMPRESS_PLAYBACK = 0, SND_COMPRESS_CAPTURE }; This patch tidyup it. Signed-off-by: -
Ajye Huang authored
In addition, having mixer control to switch between DMICs by using "dmic-gpios" property. Refer to this one as an example, commit b7a742cf ("ASoC: AMD: Use mixer control to switch between DMICs") Signed-off-by:
Ajye Huang <ajye_huang@compal.corp-partner.google.com> Reviewed-by:
Tzung-Bi Shih <tzungbi@google.com> Link: https://lore.kernel.org/r/20201106061433.1483129-3-ajye_huang@compal.corp-partner.google.comSigned-off-by:
-
Ajye Huang authored
Add a property "dmic-gpios" for switching between two MICs. Signed-off-by:
Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20201106061433.1483129-2-ajye_huang@compal.corp-partner.google.comSigned-off-by:
-
