Unverified Commit c9bc45b3 authored Dec 09, 2024 by Arnd Bergmann

Merge tag 'scmi-fix-6.13' of...

Merge tag 'scmi-fix-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

Arm SCMI fix for v6.13

Fix for the build issue in the ASoC driver with the SCMI support by
enforcing the link-time dependency if IMX_SCMI_MISC_DRV is a loadable
module but not if that is disabled.

* tag 'scmi-fix-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Fix i.MX build dependency

Link: https://lore.kernel.org/r/20241205114348.708618-1-sudeep.holla@arm.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 90386e1b 514b2262

drivers/firmware/arm_scmi/vendors/imx/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ config IMX_SCMI_BBM_EXT
		config IMX_SCMI_MISC_EXT
		tristate "i.MX SCMI MISC EXTENSION"
		depends on ARM_SCMI_PROTOCOL \|\| (COMPILE_TEST && OF)
		depends on IMX_SCMI_MISC_DRV
		default y if ARCH_MXC
		help
		This enables i.MX System MISC control logic such as gpio expander

drivers/firmware/imx/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ config IMX_SCU

		config IMX_SCMI_MISC_DRV
		tristate "IMX SCMI MISC Protocol driver"
		depends on IMX_SCMI_MISC_EXT \|\| COMPILE_TEST
		default y if ARCH_MXC
		help
		The System Controller Management Interface firmware (SCMI FW) is

sound/soc/fsl/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.