- 09 Jul, 2020 24 commits
-
-
Mark Brown authored
Merge series "ASoC: codecs: add MAX98373 Soundwire driver" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: V3: Rebased on top of two fixes already merged from the v2 patchset - no code changes Added explicit commit reference in last commit message V2 with a number of cleanups: split between I2C and SoundWire modes, as done for rt5682, and updated Kconfigs. removed useless initializations common to both modes removed idle_bias on fixed register classified as volatile in error fixed SPDX comments Pierre-Louis Bossart (2): ASoC: codecs: max98373: split I2C and common parts ASoC: Intel: sof-sdw: add MAX98373 I2C dependencies Ryan Lee (1): ASoC: codecs: max98373: add SoundWire support randerwang (1): ASoC: Intel: sdw_max98373: add card_late_probe support sound/soc/codecs/Kconfig | 20 +- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/max98373-i2c.c | 612 +++++++++++++++ sound/soc/codecs/max98373-sdw.c | 887 ++++++++++++++++++++++ sound/soc/codecs/max98373-sdw.h | 72 ++ sound/soc/codecs/max98373.c | 611 +-------------- sound/soc/codecs/max98373.h | 17 +- sound/soc/intel/boards/Kconfig | 7 +- sound/soc/intel/boards/sof_sdw.c | 19 +- sound/soc/intel/boards/sof_sdw_common.h | 6 + sound/soc/intel/boards/sof_sdw_max98373.c | 12 + 11 files changed, 1668 insertions(+), 599 deletions(-) create mode 100644 sound/soc/codecs/max98373-i2c.c create mode 100644 sound/soc/codecs/max98373-sdw.c create mode 100644 sound/soc/codecs/max98373-sdw.h base-commit: 6940701c -- 2.25.1
-
Mark Brown authored
Merge series "ASoC: Clean-up W=1 build warnings - part1" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Both Lee Jones and I submitted separate series, this is the first part of the merged result, which includes all previously reviewed patches or suggested changes along with trivial ones for CONFIG_ACPI. Lee Jones (2): ASoC: codecs: jz4770: Remove defined but never used variable 'mic_boost_tlv' ASoC: ti: omap-mcbsp-st: Remove set, but unused variable 'w' Pierre-Louis Bossart (11): ASoC: atmel: fix kernel-doc ASoC: samsung: spdif: fix kernel-doc ASoC: samsung: pcm: fix kernel-doc ASoC: tegra: tegra20_das: remove always-true comparison ASoC: uniphier: aio-core: fix kernel-doc ASoC: codecs: da7210: fix kernel-doc ASoC: codecs: da7219: fix 'defined but not used' warning ASoC: codecs: cros_ec_codec: fix 'defined but not used' warning ASoC: codecs: es8316: fix 'defined but not used' warning ASoC: codecs: max98390: fix 'defined but not used' warning ASoC: codecs: rt*: fix 'defined but not used' warning sound/soc/atmel/atmel-pcm-dma.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 1 + sound/soc/codecs/cros_ec_codec.c | 2 ++ sound/soc/codecs/da7210.c | 12 +++++++----- sound/soc/codecs/da7219.c | 2 ++ sound/soc/codecs/es8316.c | 2 ++ sound/soc/codecs/jz4770.c | 1 - sound/soc/codecs/max98390.c | 8 -------- sound/soc/codecs/rt274.c | 2 ++ sound/soc/codecs/rt286.c | 2 ++ sound/soc/codecs/rt298.c | 2 ++ sound/soc/codecs/rt5660.c | 2 ++ sound/soc/codecs/rt5677-spi.c | 2 ++ sound/soc/samsung/pcm.c | 5 +++++ sound/soc/samsung/spdif.c | 6 +++--- sound/soc/tegra/tegra20_das.c | 3 +-- sound/soc/ti/omap-mcbsp-st.c | 3 --- sound/soc/uniphier/aio-core.c | 7 +++---- 18 files changed, 37 insertions(+), 27 deletions(-) -- 2.25.1 -
Gustavo A. R. Silva authored
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-throughSigned-off-by:
Gustavo A. R. Silva <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20200709010359.GA18971@embeddedorSigned-off-by:
Mark Brown <broonie@kernel.org>
-
Dan Murphy authored
Add the TX offset slot programming. There is no RX offset slot register. Since there is no RX offset the check for slot symmetry can be removed. Signed-off-by:
Dan Murphy <dmurphy@ti.com> Link: https://lore.kernel.org/r/20200709185129.10505-2-dmurphy@ti.comSigned-off-by:
-
Dan Murphy authored
Add the ALSA controls to enable the ASI for channels 5-8 Signed-off-by:
-
Codrin Ciubotariu authored
The CPU and the codec both are represented now as components, so for PDMIC we are registering two componenets with the same name. Since there is no actual codec, we will merge the codec component into the CPU one and use a dummy codec instead, for the DAI link. As a bonus, debugfs will no longer report an error when will try to create entries for both componenets with the same name. Signed-off-by:
Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Link: https://lore.kernel.org/r/20200708163359.2698696-1-codrin.ciubotariu@microchip.comSigned-off-by:
-
Codrin Ciubotariu authored
The CPU and the codec both are represented now as components, so for CLASS-D we are registering two componenets with the same name. Since there is no actual codec, we will merge the codec component into the CPU one and use a dummy codec instead, for the DAI link. As a bonus, debugfs will no longer report an error when will try to create entries for both componenets with the same name. Signed-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning when ACPI is not defined Signed-off-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200707190612.97799-14-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning and removed unused table. In this case this a duplicate of static const struct of_device_id max98390_of_match[] = { { .compatible = "maxim,max98390", }, {} }; MODULE_DEVICE_TABLE(of, max98390_of_match); already used in the rest of the code. Signed-off-by: -
Pierre-Louis Bossart authored
Fix W=1 warning sound/soc/codecs/es8316.c:842:36: warning: 'es8316_acpi_match' defined but not used [-Wunused-const-variable=] 842 | static const struct acpi_device_id es8316_acpi_match[] = { | ^~~~~~~~~~~~~~~~~ Signed-off-by: -
Pierre-Louis Bossart authored
fix W=1 warning sound/soc/codecs/cros_ec_codec.c:1056:36: warning: 'cros_ec_codec_acpi_id' defined but not used [-Wunused-const-variable=] 1056 | static const struct acpi_device_id cros_ec_codec_acpi_id[] = { | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: -
Lee Jones authored
Looks like 'w' has remained unchecked since the driver's inception. Fixes the following W=1 kernel build warning(s): sound/soc/ti/omap-mcbsp-st.c: In function ‘omap_mcbsp_st_chgain’: sound/soc/ti/omap-mcbsp-st.c:145:6: warning: variable ‘w’ set but not used [-Wunused-but-set-variable] Peter suggested that the whole read can be removed, so that's been done too. Signed-off-by:
Lee Jones <lee.jones@linaro.org> Signed-off-by:
Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Samuel Ortiz <samuel.ortiz@nokia.com> Cc: linux-omap@vger.kernel.org Link: https://lore.kernel.org/r/20200707190612.97799-10-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Lee Jones authored
Fixes the following W=1 kernel build warning(s): In file included from include/sound/tlv.h:10, from sound/soc/codecs/jz4770.c:19: sound/soc/codecs/jz4770.c:306:35: warning: ‘mic_boost_tlv’ defined but not used [-Wunused-const-variable=] 306 | static const DECLARE_TLV_DB_SCALE(mic_boost_tlv, 0, 400, 0); | ^~~~~~~~~~~~~ include/uapi/sound/tlv.h:64:15: note: in definition of macro ‘SNDRV_CTL_TLVD_DECLARE_DB_SCALE’ 64 | unsigned int name[] = { | ^~~~ sound/soc/codecs/jz4770.c:306:14: note: in expansion of macro ‘DECLARE_TLV_DB_SCALE’ 306 | static const DECLARE_TLV_DB_SCALE(mic_boost_tlv, 0, 400, 0); | ^~~~~~~~~~~~~~~~~~~~ Signed-off-by:Paul Cercueil <paul@crapouillou.net> Cc: ter Huurne <maarten@treewalker.org> Link: https://lore.kernel.org/r/20200707190612.97799-9-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
fix W=1 warning sound/soc/codecs/da7219.c:1711:36: warning: 'da7219_acpi_match' defined but not used [-Wunused-const-variable=] 1711 | static const struct acpi_device_id da7219_acpi_match[] = { | ^~~~~~~~~~~~~~~~~ Signed-off-by:Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Link: https://lore.kernel.org/r/20200707190612.97799-8-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning, the kernel-doc syntax was probably from Doxygen? Signed-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning - wrong parameter description and bad format Signed-off-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Link: https://lore.kernel.org/r/20200707190612.97799-6-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning: sound/soc//tegra/tegra20_das.c:101:11: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] 101 | if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) && | ^~ Signed-off-by:Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20200707190612.97799-5-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warnings - missing fields in structure Credits to Sylwester Nawrocki for the pclk and cclk descriptions. Signed-off-by:
Sylwester Nawrocki <s.nawrocki@samsung.com> Link: https://lore.kernel.org/r/20200707190612.97799-4-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warnings - typos with structure fields Signed-off-by:
-
Pierre-Louis Bossart authored
Fix W=1 warning Kernel-doc is not used in one file and missing argument in the second. Signed-off-by:
Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20200707190612.97799-2-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
randerwang authored
Disable Left and Right Spk pin after boot so that sof can get suspended. This follows the same logic added to another machine driver with commit 94d2d089 ("ASoC: Intel: Boards: tgl_max98373: add dai_trigger function") Signed-off-by:
randerwang <rander.wang@linux.intel.com> Signed-off-by:
Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20200708203215.231776-5-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Pierre-Louis Bossart authored
Reflect Kconfig changes and add both SoundWire and I2C modes Signed-off-by:
Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200708203215.231776-4-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Ryan Lee authored
Add SoundWire specific parts and extend common ones already split from I2C. Signed-off-by:
Ryan Lee <ryans.lee@maximintegrated.com> Signed-off-by:
Naveen Manohar <naveen.m@intel.com> Signed-off-by:
-
Pierre-Louis Bossart authored
To prepare support for SoundWire, let's first split the I2C and common parts. No new functionality, just indents and formatting to make checkpatch happy. Signed-off-by:
-
- 08 Jul, 2020 14 commits
-
-
Mark Brown authored
Merge series "ASoC: mediatek: mt8183: support machine driver for rt1015" from Tzung-Bi Shih <tzungbi@google.com>: This series tries to reuse mt8183-mt6358-ts3a227-max98357.c for supporting machine driver with rt1015 speaker amplifier. The 1st patch is straightforward: re-order the header inclusions. The 2nd patch adds document for the new proposed compatible string. The 3rd patch changes the machine driver to support either "MAX98357A" or "RT1015" codecs. Tzung-Bi Shih (3): ASoC: mediatek: mt8183: sort header inclusions in alphabetical dt-bindings: mt8183: add compatible string for using rt1015 ASoC: mediatek: mt8183: support machine driver with rt1015 .../sound/mt8183-mt6358-ts3a227-max98357.txt | 5 +- sound/soc/mediatek/Kconfig | 5 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 171 +++++++++++++++--- 3 files changed, 153 insertions(+), 28 deletions(-) -- 2.27.0.383.g050319c2ae-goog
-
Mark Brown authored
Merge series "ASoC: topology: fix error handling flow" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: While experimenting and introducing errors in Baytrail topology files until I got them right, I encountered multiple kernel oopses and memory leaks. This is a first batch to harden the code, but we should probably think of a tool to fuzz the topology... Pierre-Louis Bossart (5): ASoC: topology: fix kernel oops on route addition error ASoC: topology: fix tlvs in error handling for widget_dmixer ASoC: topology: use break on errors, not continue ASoC: topology: factor kfree(se) in error handling ASoC: topology: add more logs when topology load fails. sound/soc/soc-topology.c | 97 ++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 39 deletions(-) base-commit: a5911ac5 -- 2.25.1
-
Mark Brown authored
Merge series "ASoC: qdsp6: add gapless compressed audio support" from Srinivas Kandagatla <srinivas.kandagatla@linaro.org>: This patchset adds gapless compressed audio support on q6asm. Gapless on q6asm is implemented using 2 streams in a single asm session. First few patches are enhacements done to q6asm interface to allow stream id per each command, gapless flags and silence meta data. Along with this there are few trivial changes which I thought are necessary! Last patch implements copy callback to allow finer control over buffer offsets, specially in partial drain cases. This patchset is tested on RB3 aka DB845c platform. Thanks, srini Srinivas Kandagatla (11): ASoC: q6asm: add command opcode to timeout error report ASoC: q6asm: rename misleading session id variable ASoC: q6asm: make commands specific to streams ASoC: q6asm: use flags directly from asm-dai ASoC: q6asm: add length to write command token ASoC: q6asm: add support to remove intial and trailing silence ASoC: q6asm: add support to gapless flag in asm open ASoC: q6asm-dai: add next track metadata support ASoC: qdsp6: use dev_err instead of pr_err ASoC: qdsp6-dai: add gapless support ASoC: q6asm-dai: add support to copy callback sound/soc/qcom/qdsp6/q6asm-dai.c | 397 +++++++++++++++++++++++-------- sound/soc/qcom/qdsp6/q6asm.c | 173 +++++++++----- sound/soc/qcom/qdsp6/q6asm.h | 48 ++-- 3 files changed, 458 insertions(+), 160 deletions(-) -- 2.21.0
-
Vijendar Mukunda authored
This patch will fix unused variables kernel warnings when CONFIG_ACPI is disabled. Reported-by:
Randy Dunlap <rdunlap@infradead.org> Signed-off-by:
Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://lore.kernel.org/r/1594147044-25582-1-git-send-email-Vijendar.Mukunda@amd.comSigned-off-by:
-
Tzung-Bi Shih authored
Machines with rt1015 should use the compatible string "mt8183-mt6358-ts3a227-rt1015". Signed-off-by:
Tzung-Bi Shih <tzungbi@google.com> Link: https://lore.kernel.org/r/20200708113233.3994206-3-tzungbi@google.comSigned-off-by:
-
Tzung-Bi Shih authored
Supports machine driver with rt1015 ("mt8183-mt6358-ts3a227-rt1015"). Embeds in existing mt8183-mt6358-ts3a227-max98357.c because they share most of the code. Signed-off-by: -
Tzung-Bi Shih authored
Sorts header inclusions in alphabetical. Signed-off-by:
-
Srinivas Kandagatla authored
Signed-off-by:
Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20200707163641.17113-10-srinivas.kandagatla@linaro.orgSigned-off-by:
-
Srinivas Kandagatla authored
Make the error reporting more useful by adding opcode to it. Without this its almost impossible to say which command actually timed out. Signed-off-by:
-
Pierre-Louis Bossart authored
Add more dev_err() logs to help trace topology load failures, since we have multiple error causes (e.g. invalid header or header that could not be loaded). Signed-off-by:
Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by:
-
Pierre-Louis Bossart authored
No need to repeat the same thing multiple times when it can be done in one location. Signed-off-by:
-
Pierre-Louis Bossart authored
Since the beginning of the topology, the code continues to the next object even when an error is detected. The topology should be handled with an all-or-nothing design, loading a partially valid topology is a sure way to get bug reports that are difficult to deal with. Changing the behavior may break previous solutions and expose problems in topology files delivered in the past, so it's probably not wise to add this patch to stable branches without revalidation. Signed-off-by:
-
Pierre-Louis Bossart authored
we need to free all allocated tlvs, not just the one allocated in the loop before releasing kcontrols - other the tlvs references will leak. Fixes: 9f90af3a ('ASoC: topology: Consolidate and fix asoc_tplg_dapm_widget_*_create flow') Signed-off-by:
-
Pierre-Louis Bossart authored
When errors happens while loading graph components, the kernel oopses while trying to remove all topology components. This can be root-caused to a list pointing to memory that was already freed on error. remove_route() is already called on errors and will perform the required cleanups so there's no need to free the route memory in soc_tplg_dapm_graph_elems_load() if the route was added to the list. We do however want to free the routes allocated but not added to the list. Fixes: 7df04ea7 ('ASoC: topology: modify dapm route loading routine and add dapm route unloading') Signed-off-by:
-
- 07 Jul, 2020 2 commits
-
-
Liao Pingfang authored
After finishing using device node got from of_find_compatible_node(), of_node_put() needs to be called. Signed-off-by:
Liao Pingfang <liao.pingfang@zte.com.cn> Link: https://lore.kernel.org/r/1594122467-11615-1-git-send-email-wang.yi59@zte.com.cnSigned-off-by:
-
Mark Brown authored
Merge series "ASoC: amd: remove warnings with make W=1" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Yet another cleanup series, with good findings of variables not used for anything. Pierre-Louis Bossart (6): ASoC: amd: acp-da7219-max98357a: fix 'defined but not used' warning ASoC: amd: acp-rt5645: fix 'defined but not used' warning ASoC: amd: raven: acp3x-pcm-dma: fix 'set but not used' warning ASoC: amd: raven: acp3x-i2s: fix 'set but not used' warning ASoC: amd: raven: acp3x-pcm-dma: remove unused-but-set variable ASoC: amd: raven: acp3x-i2s: remove unused-but-set variable sound/soc/amd/acp-da7219-max98357a.c | 2 ++ sound/soc/amd/acp-rt5645.c | 2 ++ sound/soc/amd/raven/acp3x-i2s.c | 4 ---- sound/soc/amd/raven/acp3x-pcm-dma.c | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) -- 2.25.1
-
