- 01 Jul, 2020 3 commits
-
-
Peter Ujfalusi authored
The audio support on the board is using pcm3168a codec connected to McASP10 serializers in parallel setup. The pcm3168a SCKI clock is coming via the j721e AUDIO_REFCLK2 pin. In order to support 48KHz and 44.1KHz family of sampling rates the parent clock for AUDIO_REFCLK2 needs to be changed between PLL4 (for 48KHz) and PLL15 (for 44.1KHz). The same PLLs are used for McASP10's AUXCLK clock via different HSDIVIDER. Generic card can not be used for the board as we need to switch between clock paths for different sampling rate families and also need to change the slot_width between 16 and 24 bit audio. The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e AUDIO_REFCLK0 pin. It is extending the audio support on the CPB. Due to the fact that the same PLL4/15 is used by both domains (CPB/IVI) there are cross restriction on sampling rates. The IVI side is represented as multicodec setup. PCMs available on a plain CPB (no IVI addon): hw:0,0 - cpb playback (8 channels) hw:0,1 - cpb capture (6 channels) When the IVI addon is present, additional two PCMs will be present: hw:0,2 - ivi multicodec playback (16 channels) hw:0,3 - ivi multicodec capture (12 channels) Signed-off-by:
Peter Ujfalusi <peter.ujfalusi@ti.com> Link: https://lore.kernel.org/r/20200630125843.11561-4-peter.ujfalusi@ti.comSigned-off-by:
Mark Brown <broonie@kernel.org>
-
Peter Ujfalusi authored
The audio support on the Common Processor Board board is using pcm3168a codec connected to McASP10 serializers in parallel setup. The Infotainment board plugs into the Common Processor Board, the support of the extension board is extending the CPB audio support by adding the two codecs on the expansion board. The audio support on the Infotainment Expansion Board consists of McASP0 connected to two pcm3168a codecs with dedicated set of serializers to each. The SCKI for pcm3168a is sourced from j721e AUDIO_REFCLK0 pin. Signed-off-by:
-
Peter Ujfalusi authored
In order to dai stream widgets to be created the stream_name must be set. Signed-off-by:
-
- 29 Jun, 2020 11 commits
-
-
Mark Brown authored
Merge branch 'for-5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.9
-
Hans de Goede authored
The adc_vol_tlv volume-control has a range from -17.625 dB to +30 dB, not -176.25 dB to + 300 dB. This wrong scale is esp. a problem in userspace apps which translate the dB scale to a linear scale. With the logarithmic dB scale being of by a factor of 10 we loose all precision in the lower area of the range when apps translate things to a linear scale. E.g. the 0 dB default, which corresponds with a value of 47 of the 0 - 127 range for the control, would be shown as 0/100 in alsa-mixer. Since the centi-dB values used in the TLV struct cannot represent the 0.375 dB step size used by these controls, change the TLV definition for them to specify a min and max value instead of min + stepsize. Signed-off-by:
Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20200628155231.71089-5-hdegoede@redhat.comSigned-off-by:
-
Hans de Goede authored
The Lenovo Miix 2 10 has a keyboard dock with extra speakers in the dock. Rather then the ACL5672's GPIO1 pin being used as IRQ to the CPU, it is actually used to enable the amplifier for these speakers (the IRQ to the CPU comes directly from the jack-detect switch). Add a quirk for having an ext speaker-amplifier enable pin on GPIO1 and replace the Lenovo Miix 2 10's dmi_system_id table entry's wrong GPIO_DEV quirk (which needs to be renamed to GPIO1_IS_IRQ) with the new RT5670_GPIO1_IS_EXT_SPK_EN quirk, so that we enable the external speaker-amplifier as necessary. Also update the ident field for the dmi_system_id table entry, the Miix models are not Thinkpads. Fixes: 67e03ff3 ("ASoC: codecs: rt5670: add Thinkpad Tablet 10 quirk") Signed-off-by:
-
Hans de Goede authored
The RT5670_PWR_ANLG1 register has 3 bits to select the LDO voltage, so the correct mask is 0x7 not 0x3. Because of this wrong mask we were programming the ldo bits to a setting of binary 001 (0x05 & 0x03) instead of binary 101 when moving to SND_SOC_BIAS_PREPARE. According to the datasheet 001 is a reserved value, so no idea what it did, since the driver was working fine before I guess we got lucky and it does something which is ok. Fixes: 5e8351de ("ASoC: add RT5670 CODEC driver") Signed-off-by:
-
Hans de Goede authored
The default mode for SSP configuration is TDM 4 slot and so far we were using this for the bus format on cht-bsw-rt56732 boards. One board, the Lenovo Miix 2 10 uses not 1 but 2 codecs connected to SSP2. The second piggy-backed, output-only codec is inside the keyboard-dock (which has extra speakers). Unlike the main rt5672 codec, we cannot configure this codec, it is hard coded to use 2 channel 24 bit I2S. Using 4 channel TDM leads to the dock speakers codec (which listens in on the data send from the SSP to the rt5672 codec) emiting horribly distorted sound. Since we only support 2 channels anyways, there is no need for TDM on any cht-bsw-rt5672 designs. So we can simply use I2S 2ch everywhere. This commit fixes the Lenovo Miix 2 10 dock speakers issue by changing the bus format set in cht_codec_fixup() to I2S 2 channel. This change has been tested on the following devices with a rt5672 codec: Lenovo Miix 2 10 Lenovo Thinkpad 8 Lenovo Thinkpad 10 (gen 1) Signed-off-by:
-
Dan Murphy authored
Add a property to configure the slot for the voltage sense monitoring of the device. Vsense data will be sent to the processor via the slot defined by the property Signed-off-by:
Dan Murphy <dmurphy@ti.com> Link: https://lore.kernel.org/r/20200626154143.20351-2-dmurphy@ti.comSigned-off-by:
-
Dan Murphy authored
Add Vsense slot configuration based on the device tree. Adding this property enables the slot programming to be moved to the tdm_set_slot callback. This in affect sets the slots for the Isense and Vsense and enabling this these modes are now based on whether these features were powered on or not. Signed-off-by:
-
Dan Murphy authored
Add programming for the tdm slots for the right and left. This also requires configuring the RX/TX offsets for the DAI format type. Signed-off-by:
-
Randy Dunlap authored
sound/soc/soc-io.c was merged into sound/soc/soc-component.c, so fixup the Documentation to use the updated file name. Error: Cannot open file ../sound/soc/soc-io.c WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno ../sound/soc/soc-io.c' failed with return code 1 Fixes: 460b42d1 ("ASoC: soc-component: merge soc-io.c into soc-component.c") Signed-off-by:
Randy Dunlap <rdunlap@infradead.org> Acked-by:
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/a9f59f30-8cf2-ea82-567c-1706fd64fe62@infradead.orgSigned-off-by:
-
Rohit kumar authored
Add support for 384KHz sample rate and S24_3LE bitwidth for dummy dai. Signed-off-by:
Rohit kumar <rohitkr@codeaurora.org> Link: https://lore.kernel.org/r/1593265030-1451-1-git-send-email-rohitkr@codeaurora.orgSigned-off-by:
-
Geert Uytterhoeven authored
When building on allyesconfig kernel for a NO_DMA=y platform (e.g. Sun-3), CONFIG_SND_SOC_QCOM_COMMON=y, but CONFIG_SND_SOC_QDSP6_AFE=n, leading to a link failure: sound/soc/qcom/common.o: In function `qcom_snd_parse_of': common.c:(.text+0x2e2): undefined reference to `q6afe_is_rx_port' While SND_SOC_QDSP6 depends on HAS_DMA, SND_SOC_MSM8996 and SND_SOC_SDM845 don't, so the following warning is seen: WARNING: unmet direct dependencies detected for SND_SOC_QDSP6 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && HAS_DMA [=n] Selected by [y]: - SND_SOC_MSM8996 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] - SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && CROS_EC [=y] && I2C [=y] && SOUNDWIRE [=y] Until recently, this warning was harmless (from a compile-testing point-of-view), but the new user of q6afe_is_rx_port() turned this into a hard failure. As the QDSP6 driver itself builds fine if NO_DMA=y, and it depends on QCOM_APR (which in turns depends on ARCH_QCOM || COMPILE_TEST), it is safe to increase compile testing coverage. Hence fix the link failure by dropping the HAS_DMA dependency of SND_SOC_QDSP6. Fixes: a2120089 ("ASoC: qcom: common: set correct directions for dailinks") Fixes: 6b1687bf ("ASoC: qcom: add sdm845 sound card support") Fixes: a6f933f6 ("ASoC: qcom: apq8096: Add db820c machine driver") Signed-off-by:Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/20200629122443.21736-1-geert@linux-m68k.orgSigned-off-by:
-
- 26 Jun, 2020 19 commits
-
-
Naveen Manohar authored
Add max98373-sdw helper function, which configures 2x MAX98373 codecs to Link1. This patch shares code between the I2S and SoundWire modes of MAX98373 and adds the trigger already added for I2S. Signed-off-by:
Rander Wang <rander.wang@linux.intel.com> Signed-off-by:
Naveen Manohar <naveen.m@intel.com> Signed-off-by:
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by:
Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Link: https://lore.kernel.org/r/20200625192620.4312-1-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Masanari Iida authored
This patch fixes a spelling typo in samsung/Kconfig. Signed-off-by:
Masanari Iida <standby24x7@gmail.com> Link: https://lore.kernel.org/r/20200626142958.253614-1-standby24x7@gmail.comSigned-off-by:
-
Naveen Manohar authored
RT5682 is in Soundwire mode on Link0 & 2x MAX98373 on link1. Signed-off-by:
-
Fred Oh authored
dailink.codecs is pointer to a codec array. Explicitly access first codec's dai_name. Signed-off-by:
Fred Oh <fred.oh@linux.intel.com> Signed-off-by:
Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by:
Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by:
-
Mark Brown authored
Merge series "ASoC: Intel: machine driver updates for 5.9" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: This patchset adds: a) fixes for missing .owner = THIS_MODULE initializations for snd_soc_card structures b) extensions for TigerLake and JasperLake reusing the same machine drivers. c) Max98373 support for SoundWire machine driver. d) cleanups (use-after-free, quirks, etc). Bard Liao (1): ASoC: intel: cml_rt1011_rt5682: use for_each_card_prelinks Dharageswari R (3): ASoC: Intel: Boards: tgl_max98373: add dai_trigger function ASoC: Intel: Boards: tgl_max98373: Fix the comment for max_98373_components ASoC: Intel: Boards: tgl_max98373: Update TDM configuration in hw_params Fred Oh (3): ASoC: Intel: Boards: cml_rt1011_rt5682: reduce log level for printing quirk ASoC: Intel: Boards: cml_rt1011_rt5682: use statically define codec config ASoc: Intel: cml_rt1011_rt5682: explicitly access first codec Naveen Manohar (2): ASoC: Intel: sof_sdw: Add MAX98373 support ASoC: Intel: common: add match table for TGL MAX98373 + RT5682 SoundWire driver Pierre-Louis Bossart (6): ASoC: SOF: nocodec: add missing .owner field ASoC: Intel: cml_rt1011_rt5682: add missing .owner field ASoC: Intel: sof_sdw: add missing .owner field ASoC: Intel: bxt_rt298: add missing .owner field ASoC: Intel: sof_sdw: add quirk override with kernel parameter ASoC: Intel: boards: byt*.c: remove cast in dev_info quirk log Yong Zhi (1): ASoC: intel: sof_rt5682: Add support for jsl-max98360a-rt5682 randerwang (1): ASoC: Intel: sdw_max98373: add card_late_probe support sound/soc/intel/boards/Kconfig | 3 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bxt_rt298.c | 2 + sound/soc/intel/boards/bytcht_es8316.c | 5 +- sound/soc/intel/boards/bytcr_rt5640.c | 4 +- sound/soc/intel/boards/bytcr_rt5651.c | 4 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 90 ++++++------------- sound/soc/intel/boards/sof_maxim_common.c | 55 ++++++++++-- sound/soc/intel/boards/sof_maxim_common.h | 3 + sound/soc/intel/boards/sof_rt5682.c | 32 +++++++ sound/soc/intel/boards/sof_sdw.c | 72 ++++++++++++++- sound/soc/intel/boards/sof_sdw_common.h | 15 ++++ sound/soc/intel/boards/sof_sdw_max98373.c | 86 ++++++++++++++++++ .../intel/common/soc-acpi-intel-jsl-match.c | 13 +++ .../intel/common/soc-acpi-intel-tgl-match.c | 25 ++++++ sound/soc/sof/nocodec.c | 1 + 16 files changed, 332 insertions(+), 80 deletions(-) create mode 100644 sound/soc/intel/boards/sof_sdw_max98373.c base-commit: 6f81e520 -- 2.20.1 -
Colton Lewis authored
Silence documentation build warning by correcting kernel-doc comment for snd_soc_runtime_action. ./sound/soc/soc-pcm.c:220: warning: Function parameter or member 'action' not described in 'snd_soc_runtime_action' Signed-off-by:
Colton Lewis <colton.w.lewis@protonmail.com> Link: https://lore.kernel.org/r/20200626053953.68797-1-colton.w.lewis@protonmail.comSigned-off-by:
-
Dharageswari R authored
This patch updates tx_mask, so that (0-3)slots are reserved for Maxim amps to feedback data. V0->slot0, I0->slot1, V1->slot2, I1->slot3. also update slot_width in tdm configuration to 24 as the BE configuration is 24 in topology. Signed-off-by:
Dharageswari R <dharageswari.r@intel.com> Signed-off-by:
-
Bard Liao authored
for_each_card_prelinks() is a common API to walk through each prelink in the card. Signed-off-by:
-
Fred Oh authored
When the cml_rt1011_rt5682_dailink[].codecs pointer is overridden by a quirk with a devm allocated structure and the probe is deferred, in the next probe we will see an use-after-free condition (verified with KASAN). This can be avoided by using statically allocated configurations - which simplifies the code quite a bit as well. KASAN issue fixed. [ 23.301373] cml_rt1011_rt5682 cml_rt1011_rt5682: sof_rt1011_quirk = f [ 23.301875] ================================================================== [ 23.302018] BUG: KASAN: use-after-free in snd_cml_rt1011_probe+0x23a/0x3d0 [snd_soc_cml_rt1011_rt5682] [ 23.302178] Read of size 8 at addr ffff8881ec6acae0 by task kworker/0:2/105 [ 23.302320] CPU: 0 PID: 105 Comm: kworker/0:2 Not tainted 5.7.0-rc7-test+ #3 [ 23.302322] Hardware name: Google Helios/Helios, BIOS 01/21/2020 [ 23.302329] Workqueue: events deferred_probe_work_func [ 23.302331] Call Trace: [ 23.302339] dump_stack+0x76/0xa0 [ 23.302345] print_address_description.constprop.0.cold+0xd3/0x43e [ 23.302351] ? _raw_spin_lock_irqsave+0x7b/0xd0 [ 23.302355] ? _raw_spin_trylock_bh+0xf0/0xf0 [ 23.302362] ? snd_cml_rt1011_probe+0x23a/0x3d0 [snd_soc_cml_rt1011_rt5682] [ 23.302365] __kasan_report.cold+0x37/0x86 [ 23.302371] ? snd_cml_rt1011_probe+0x23a/0x3d0 [snd_soc_cml_rt1011_rt5682] [ 23.302375] kasan_report+0x38/0x50 [ 23.302382] snd_cml_rt1011_probe+0x23a/0x3d0 [snd_soc_cml_rt1011_rt5682] [ 23.302389] platform_drv_probe+0x66/0xc0 Fixes: 629ba12e ("ASoC: Intel: boards: split woofer and tweeter support") Suggested-by:
-
Fred Oh authored
Change dev_info to dev_dbg to reduce noise during multiple deferred probes. Signed-off-by:
-
Yong Zhi authored
Add support for max98360a speaker amp on SSP1 and ALC5682 on SSP0 for jsl+ platform. Signed-off-by:
Yong Zhi <yong.zhi@intel.com> Signed-off-by:
Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200625191308.3322-10-pierre-louis.bossart@linux.intel.comSigned-off-by:
-
Dharageswari R authored
MAX_98373_DEV0_NAME is the Right speaker and MAX_98373_DEV1_NAME is the Left speaker, hence updating the comments for max98373 dailink components accordingly. Signed-off-by:
-
Dharageswari R authored
Speaker amplifier feedback is not modeled as being dependent on any active output. Even when there is no playback happening, parts of the graph, specifically the IV sense->speaker protection->output remains active and this prevents the DSP from entering low-power states. This patch suggests a machine driver level approach where the speaker pins are enabled/disabled dynamically depending on stream start/stop events. DPAM graph representations show the feedback loop is indeed disabled and low-power states can be reached. Signed-off-by:
-
Pierre-Louis Bossart authored
We don't need an explicit cast, using the right format is simple enough. Suggested-by:
-
Pierre-Louis Bossart authored
During the bring-up of new platforms, or to take care of specific hardware reworks, it's useful to add a kernel parameter to override the default DMI-based quirks. For example, adding the following line in a .conf file in /etc/modprobe.d/ will change the default quirk and log the changes if dynamic debug is enabled. options snd_soc_sof_sdw quirk=0x802 [ 735.025785] sof_sdw sof_sdw: Overriding quirk 0x10 => 0x802 [ 735.025787] sof_sdw sof_sdw: quirk realtek,jack-detect-source 2 [ 735.025790] sof_sdw sof_sdw: quirk SOF_RT715_DAI_ID_FIX enabled Tested on ICL RVP with add-on board instead of default codec. Signed-off-by:
-
Pierre-Louis Bossart authored
This field is required for ASoC cards. Not setting it will result in a module->name pointer being NULL and generate problems such as cat /proc/asound/modules 0 (efault) Fixes: 76016322 ('ASoC: Intel: Add Broxton-P machine driver') Reported-by:
Jaroslav Kysela <perex@perex.cz> Suggested-by:
Takashi Iwai <tiwai@suse.de> Signed-off-by:
-
Pierre-Louis Bossart authored
This field is required for ASoC cards. Not setting it will result in a module->name pointer being NULL and generate problems such as cat /proc/asound/modules 0 (efault) Fixes: 52db12d1 ('ASoC: Intel: boards: add sof_sdw machine driver') Reported-by:
-
Pierre-Louis Bossart authored
This field is required for ASoC cards. Not setting it will result in a module->name pointer being NULL and generate problems such as cat /proc/asound/modules 0 (efault) Fixes: 17fe95d6 ('ASoC: Intel: boards: Add CML m/c using RT1011 and RT5682') Reported-by:
-
Pierre-Louis Bossart authored
This field is required for ASoC cards. Not setting it will result in a module->name pointer being NULL and generate problems such as cat /proc/asound/modules 0 (efault) Fixes: 8017b8fd ('ASoC: SOF: Add Nocodec machine driver support') Reported-by:
-
- 25 Jun, 2020 7 commits
-
-
Tzung-Bi Shih authored
To fix compilation error: error: implicit declaration of function 'ACPI_PTR' [-Werror,-Wimplicit-function-declaration] .acpi_match_table = ACPI_PTR(rt1015_acpi_match), ^ Adds the missing header "acpi.h" inclusion and sorts in alphabetical. Signed-off-by:Tzung-Bi Shih <tzungbi@google.com> Link: https://lore.kernel.org/r/20200625153543.85039-4-tzungbi@google.comSigned-off-by:
-
Tzung-Bi Shih authored
To fix compilation warnings: - struct 'snd_soc_pcm_runtime' declared inside parameter list will not be visible outside of this definition or declaration - struct 'soc_enum' declared inside parameter list will not be visible outside of this definition or declaration Declares the missing structure prototypes. Signed-off-by:
-
Tzung-Bi Shih authored
To fix compilation error: - error: field 'XXX' has incomplete type Moves definition of enum snd_soc_bias_level from soc.h to soc-dapm.h. Signed-off-by:
-
Dan Murphy authored
Fix the shut-down gpio property to be shut-down-gpio and fix the example. Signed-off-by:
-
Dan Murphy authored
Fix the issue found that there is an extra space before a comma in the volume control. Fixes: bf726b1c ("ASoC: tas2562: Add support for digital volume control") Signed-off-by:
-
Dan Murphy authored
Update the shutdown GPIO property to be shutdown from shut-down. Fixes: c173dba4 ("ASoC: tas2562: Introduce the TAS2562 amplifier") Signed-off-by:
-
Jaroslav Kysela authored
Signed-off-by:
Alex Deucher <alexander.deucher@amd.com> Cc: Mark Brown <broonie@kernel.org> Cc: vijendar.mukunda@amd.com Cc: Alexander.Deucher@amd.com Link: https://lore.kernel.org/r/20200625115829.791750-1-perex@perex.czSigned-off-by:
-
