- 04 Nov, 2020 18 commits
-
-
Mark Brown authored
Merge series "ASoC: topology: Change to resource managed memory" from Amadeusz Sławiński<amadeuszx.slawinski@linux.intel.com>: Almost all other allocations in ASoC API are resource managed, the only exception is soc-topology.c. This patchset clean ups few unnecessary functions in preparation for change and then changes to devm_ functions for allocation. Amadeusz Sławiński (6): ASoC: topology: Remove unused functions from topology API ASoC: topology: Remove multistep topology loading ASoC: topology: Unify all device references ASoC: topology: Change allocations to resource managed ASoC: topology: Remove empty functions ASoC: topology: Simplify remove_widget function include/sound/soc-topology.h | 13 +- sound/soc/intel/skylake/skl-topology.c | 9 +- sound/soc/soc-topology.c | 302 +++++-------------------- sound/soc/sof/pcm.c | 2 +- sound/soc/sof/topology.c | 4 +- 5 files changed, 57 insertions(+), 273 deletions(-) -- 2.25.1
-
Mark Brown authored
This series of patches adds support for Mediatek AFE for MT8192 SoC. At the same time, the calibration function of MT6359 is completed with real machine driver. The patch is based on broonie tree "for-next" branch. Change since v3: - use normal conditional statements to improve legiblity in [v3,3/9] - remove mtk_i2s_hd_en_event as there's trace in the core - impove mt8192_i2s_enum and mt8192_adda_enum Change since v2: - split the dai driver files as a separate patch - fix dt-bindings to GPL-2.0-only License - remove unnecessary preperty descriptions such as 'maxItems' Change since v1: - fixed some typos related to dt-bindings in [v1,3/5] and [v1,5/5] - add vendor prefix to the properties, such as "mediatek,apmixedsys" - add a dependency description to indicate the required header files Jiaxin Yu (9): ASoC: mediatek: mt6359: add the calibration functions ASoC: mediatek: mt8192: add platform driver ASoC: mediatek: mt8192: support i2s in platform driver ASoC: mediatek: mt8192: support adda in platform driver ASoC: mediatek: mt8192: support pcm in platform driver ASoC: mediatek: mt8192: support tdm in platform driver dt-bindings: mediatek: mt8192: add audio afe document ASoC: mediatek: mt8192: add machine driver with mt6359, rt1015 and rt5682 dt-bindings: mediatek: mt8192: add mt8192-mt6358-rt1015-rt5682 document .../bindings/sound/mt8192-afe-pcm.yaml | 100 + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 42 + sound/soc/codecs/mt6359.c | 110 + sound/soc/codecs/mt6359.h | 7 + sound/soc/mediatek/Kconfig | 23 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 13 +- sound/soc/mediatek/common/mtk-base-afe.h | 1 + sound/soc/mediatek/mt8192/Makefile | 16 + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 669 ++++ sound/soc/mediatek/mt8192/mt8192-afe-clk.h | 244 ++ sound/soc/mediatek/mt8192/mt8192-afe-common.h | 170 + .../soc/mediatek/mt8192/mt8192-afe-control.c | 163 + sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 306 ++ sound/soc/mediatek/mt8192/mt8192-afe-gpio.h | 19 + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2389 +++++++++++++ sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 1471 ++++++++ sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 2110 +++++++++++ sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 409 +++ sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 778 ++++ .../mediatek/mt8192/mt8192-interconnection.h | 65 + .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 1058 ++++++ sound/soc/mediatek/mt8192/mt8192-reg.h | 3131 +++++++++++++++++ 23 files changed, 13291 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml create mode 100644 sound/soc/mediatek/mt8192/Makefile create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-clk.h create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-common.h create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-control.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-gpio.h create mode 100644 sound/soc/mediatek/mt8192/mt8192-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-adda.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-i2s.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-dai-tdm.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-interconnection.h create mode 100644 sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c create mode 100644 sound/soc/mediatek/mt8192/mt8192-reg.h -- 2.18.0 -
Shuming Fan authored
Add TDM slot callback function to support TDM configuration Signed-off-by:
Shuming Fan <shumingf@realtek.com> Reviewed-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20201104092005.2227-1-shumingf@realtek.comSigned-off-by:
Mark Brown <broonie@kernel.org>
-
Jiaxin Yu authored
This patch adds document for the machine board with mt6358, rt1015 and rt5682. Signed-off-by:
Jiaxin Yu <jiaxin.yu@mediatek.com> Link: https://lore.kernel.org/r/1604390378-23993-10-git-send-email-jiaxin.yu@mediatek.comSigned-off-by:
-
Jiaxin Yu authored
This patch adds support for the machine board with mt6359, rt1015 and rt5682. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 audio afe document. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 tdm dai driver. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 pcm dai driver. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 adda dai driver. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 i2s dai driver. Signed-off-by:
-
Jiaxin Yu authored
This patch adds mt8192 platform and affiliated drivers. Signed-off-by:
-
Jiaxin Yu authored
Add the calibraion functions for initializing the codec when registering the machine driver. Signed-off-by:
-
Amadeusz Sławiński authored
Now that enum and mixer kcontrols are freed by resource management framework, removing kcontrol becomes one function call, so simplify code in remove_widget. Reviewed-by:
Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Signed-off-by:
Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Reviewed-by:
Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20201030145427.3497990-7-amadeuszx.slawinski@linux.intel.comSigned-off-by:
-
Amadeusz Sławiński authored
After changing memory management to resource managed one, some of the functions became no ops, remove them as they are no longer needed. Reviewed-by:
-
Amadeusz Sławiński authored
In order for topology to be resource managed, change all allocations to be resource managed: k*alloc -> devm_k*alloc kstrdup -> devm_kstrdup Exceptions where non resource managed allocation is left is soc_tplg_dapm_widget_create(), as it uses pointer to memory locally and frees it up after use, as well as soc_tplg_dapm_graph_elems_load(), which has temporary pointer to table of routes. After conversion all redundant calls in error and clean up paths were removed. Also removed some variables which become unneeded when there is no calls using them. Reviewed-by:
-
Amadeusz Sławiński authored
In few places tplg->comp->dev is used, while everywhere else tplg->dev is being used. Unify those uses towards tplg->dev, as it is being set to comp->dev during initialization anyway. Reviewed-by:
-
Amadeusz Sławiński authored
In theory topology can be loaded in multiple steps by providing index to snd_soc_tplg_component_load, however, from usability point of view it doesn't make sense, as can be seen from all current users loading topology in one go. Remove the unnecessary parameter. Reviewed-by:
-
Amadeusz Sławiński authored
Topology API exposes snd_soc_tplg_widget_remove and snd_soc_tplg_widget_remove_all, but both are nowhere used. All current users load and unload topology as a whole. As following commits introduce resource managed memory, remove them to simplify code and reduce maintenance burden. Reviewed-by:
-
- 03 Nov, 2020 6 commits
-
-
Tom Rix authored
A semicolon is not needed after a switch statement. Signed-off-by:
Tom Rix <trix@redhat.com> Link: https://lore.kernel.org/r/20201101160312.2296146-1-trix@redhat.comSigned-off-by:
-
Dan Carpenter authored
This code is correct, but it should be indented one more tab. Signed-off-by:
Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/20201103101853.GD1127762@mwandaSigned-off-by:
-
Tom Rix authored
A semicolon is not needed after a switch statement. Signed-off-by:
Sameer Pujar <spujar@nvidia.com> Link: https://lore.kernel.org/r/20201101172412.2306144-1-trix@redhat.comSigned-off-by:
-
Zhang Qilong authored
davinci_mcasp_get_dt_params alway return zero, and its return value could be ignored by the caller. So make it 'void' type to avoid the check its return value. Fixes: 764958f2 ("ASoC: ti: davinci-mcasp: Support for auxclk-fs-ratio") Signed-off-by:
Zhang Qilong <zhangqilong3@huawei.com> Acked-by:
Peter Ujfalusi <peter.ujfalusi@ti.com> Link: https://lore.kernel.org/r/20201102103428.32678-1-zhangqilong3@huawei.comSigned-off-by:
-
Tom Rix authored
A semicolon is not needed after a switch statement. Signed-off-by:
-
Codrin Ciubotariu authored
Besides the fact that muxclk is optional, muxclk can be set using assigned-clocks, removing the need to set it in driver. The warning is thus unneeded, so we can transform it in a debug print, eventually to just reflect that muxclk was not set by the driver. Signed-off-by:
Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Link: https://lore.kernel.org/r/20201103100554.1307190-1-codrin.ciubotariu@microchip.comSigned-off-by:
-
- 02 Nov, 2020 3 commits
-
-
Tom Rix authored
A semicolon is not needed after a switch statement. Signed-off-by:
-
Xu Wang authored
Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove it. Signed-off-by:
Xu Wang <vulab@iscas.ac.cn> Acked-by:
-
Tom Rix authored
A semicolon is not needed after a switch statement. Signed-off-by:
-
- 30 Oct, 2020 13 commits
-
-
Mark Brown authored
First patch adds tdm 4-slot 100fs DAI setting to avoid jitter of using 64fs on CML boards. Second patch is a DMI quirk for HP Dooly. Changes since v1: -Add comment on Dooly's DMI quirk Brent Lu (2): ASoC: intel: sof_rt5682: Add support for cml_rt1015_rt5682 ASoC: intel: sof_rt5682: Add quirk for Dooly sound/soc/intel/boards/sof_rt5682.c | 65 +++++++++++++++++-- .../intel/common/soc-acpi-intel-cml-match.c | 13 ++++ 2 files changed, 73 insertions(+), 5 deletions(-) -- 2.17.1
-
Brent Lu authored
This DMI product family string of this board is "Google_Hatch" so the DMI quirk will take place. However, this board is using rt1015 speaker amp instead of max98357a specified in the quirk. Therefore, we need an new DMI quirk for this board. Signed-off-by:
Brent Lu <brent.lu@intel.com> Acked-by:
-
Brent Lu authored
This patch adds the driver data and updates quirk info for cml with rt1015 speaker amp and rt5682 headset codec. Due to different mclk frequency on JSL and CML, we need to use 4 slot TDM 100fs to avoid the SSP m/n counter. Signed-off-by:
-
Clément Péron authored
Like A83T the Allwinner H3 doesn't have the DMA reception available for some audio interfaces. As it's already documented for A83T convert this to an enum and add the H3 interface. Acked-by:
Rob Herring <robh@kernel.org> Signed-off-by:
Clément Péron <peron.clem@gmail.com> Link: https://lore.kernel.org/r/20201030144648.397824-15-peron.clem@gmail.comSigned-off-by:
-
Jernej Skrabec authored
H6 I2S is very similar to H3, except that it supports up to 16 channels and thus few registers have fields on different position. Signed-off-by:
Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by:
Marcus Cooper <codekipper@gmail.com> Acked-by:
Maxime Ripard <mripard@kernel.org> Acked-by:
Chen-Yu Tsai <wens@csie.org> Signed-off-by:
-
Clément Péron authored
Checkpatch script produces warning: WARNING: function definition argument 'const struct sun4i_i2s *' should also have an identifier name. Let's fix this by adding identifier name to get_bclk_parent_rate() and set_fmt() callback definition. Acked-by:
-
Samuel Holland authored
Because SUN4I_I2S_FIFO_CTRL_REG is volatile, writes done while the regmap is cache-only are ignored. To work around this, move the configuration to a callback that runs while the ASoC core has a runtime PM reference to the device. Signed-off-by:
Samuel Holland <samuel@sholland.org> Reviewed-by:
-
Clément Péron authored
The FIFO TX reg is volatile and sun8i i2s register mapping is different from sun4i. Even if in this case it's doesn't create an issue, Avoid setting some regs that are undefined in sun8i. Acked-by:
-
Marcus Cooper authored
Extend the functionality of the driver to include support of 20 and 24 bits per sample. Signed-off-by:
-
Marcus Cooper authored
On the newer SoCs such as the H3 and A64 this is set by default to transfer a 0 after each sample in each slot. However the A10 and A20 SoCs that this driver was developed on had a default setting where it padded the audio gain with zeros. This isn't a problem while we have only support for 16bit audio but with larger sample resolution rates in the pipeline then SEXT bits should be cleared so that they also pad at the LSB. Without this the audio gets distorted. Set sign extend sample for all the sunxi generations even if they are not affected. This will keep consistency and avoid relying on default. Signed-off-by:
-
Clément Péron authored
We are actually using a complex formula to just return a bunch of simple values. Also this formula is wrong for sun4i when calling get_wss() the function return 4 instead of 3. Replace this with a simpler switch case. Also drop the i2s params which is unused and return a simple int as returning an error code could be out of range for an s8 and there is no optim to return a s8 here. Fixes: 619c15f7 ("ASoC: sun4i-i2s: Change SR and WSS computation") Reviewed-by:
-
Jernej Skrabec authored
H6 I2S is very similar to that in H3, except it supports up to 16 channels. Signed-off-by:
-
Clément Péron authored
As slots and slot_width can be set manually using set_tdm(). These values are then kept in sun4i_i2s struct. So we need to check if these values are set or not. This is not done actually and will trigger a bug. For example, if we set to the simple soundcard in the device-tree dai-tdm-slot-width = <32> and then start a stream using S16_LE, currently we would calculate BCLK for 32-bit slots, but program lrck_period for 16-bit slots, making the sample rate double what we expected. To fix this, we need to check if these values are set or not but as this logic is already done by the caller. Avoid duplicating this logic and just pass the required values as params to set_chan_cfg(). Suggested-by:
-
