diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-16 10:10:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-16 10:10:53 -0800 |
| commit | f44d154d6e3d633d4c49a5d6aed8a0e4684ae25e (patch) | |
| tree | f04eb9eb9d3d17840d10b5c5bd1fad395326fb0a /sound/soc | |
| parent | dc690bc256edd9da6596fccf978327309173f44a (diff) | |
| parent | f578281000c50cae991c40e1f68b2fc0b1b9e60e (diff) | |
| download | lwn-f44d154d6e3d633d4c49a5d6aed8a0e4684ae25e.tar.gz lwn-f44d154d6e3d633d4c49a5d6aed8a0e4684ae25e.zip | |
Merge tag 'soc-fixes-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"Three small fixes for the soc tree:
- devicetee fix for the Arm Juno reference machine, to allow more
interesting PCI configurations
- build fix for SCMI firmware on the NXP i.MX platform
- fix for a race condition in Arm FF-A firmware"
* tag 'soc-fixes-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: fvp: Update PCIe bus-range property
firmware: arm_ffa: Fix the race around setting ffa_dev->properties
firmware: arm_scmi: Fix i.MX build dependency
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 8e88830e8e57..678540b78280 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -29,8 +29,8 @@ config SND_SOC_FSL_SAI config SND_SOC_FSL_MQS tristate "Medium Quality Sound (MQS) module support" depends on SND_SOC_FSL_SAI + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select REGMAP_MMIO - select IMX_SCMI_MISC_DRV if IMX_SCMI_MISC_EXT !=n help Say Y if you want to add Medium Quality Sound (MQS) support for the Freescale CPUs. |