iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: SOF: i.MX: simplify Kconfig

Browse Source 
Follow the Intel example and simplify the Kconfig
a) start from the end-product for 'select' chains
b) use 'depends on' to filter out configurations.
c) use snd-sof-of as a common module without any 'select'

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20211116124131.46414-1-daniel.baluta@oss.nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2021-11-16 14:41:31 +02:00 committed by Mark Brown
parent 5f55c9693a
commit 7548a391c5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sof/Kconfig
View File

@ -40,12 +40,14 @@ config SND_SOC_SOF_ACPI_DEV
config SND_SOC_SOF_OF config SND_SOC_SOF_OF
tristate "SOF OF enumeration support" tristate "SOF OF enumeration support"
depends on OF || COMPILE_TEST depends on OF || COMPILE_TEST
select SND_SOC_SOF
help help
This adds support for Device Tree enumeration. This option is This adds support for Device Tree enumeration. This option is
required to enable i.MX8 devices. required to enable i.MX8 devices.
Say Y if you need this option. If unsure select "N". Say Y if you need this option. If unsure select "N".
config SND_SOC_SOF_OF_DEV
tristate
config SND_SOC_SOF_COMPRESS config SND_SOC_SOF_COMPRESS
bool bool
select SND_SOC_COMPRESS select SND_SOC_COMPRESS

2
sound/soc/sof/Makefile
View File

@ -17,7 +17,7 @@ obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o
obj-$(CONFIG_SND_SOC_SOF_ACPI_DEV) += snd-sof-acpi.o obj-$(CONFIG_SND_SOC_SOF_ACPI_DEV) += snd-sof-acpi.o
obj-$(CONFIG_SND_SOC_SOF_OF) += snd-sof-of.o obj-$(CONFIG_SND_SOC_SOF_OF_DEV) += snd-sof-of.o
obj-$(CONFIG_SND_SOC_SOF_PCI_DEV) += snd-sof-pci.o obj-$(CONFIG_SND_SOC_SOF_PCI_DEV) += snd-sof-pci.o
obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/ obj-$(CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL) += intel/

46
sound/soc/sof/imx/Kconfig
View File

@ -11,53 +11,33 @@ config SND_SOC_SOF_IMX_TOPLEVEL
if SND_SOC_SOF_IMX_TOPLEVEL if SND_SOC_SOF_IMX_TOPLEVEL
config SND_SOC_SOF_IMX_OF
def_tristate SND_SOC_SOF_OF
select SND_SOC_SOF_IMX8 if SND_SOC_SOF_IMX8_SUPPORT
select SND_SOC_SOF_IMX8M if SND_SOC_SOF_IMX8M_SUPPORT
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level.
config SND_SOC_SOF_IMX_COMMON config SND_SOC_SOF_IMX_COMMON
tristate tristate
select SND_SOC_SOF_OF_DEV
select SND_SOC_SOF
select SND_SOC_SOF_XTENSA
select SND_SOC_SOF_COMPRESS
help help
This option is not user-selectable but automagically handled by This option is not user-selectable but automagically handled by
'select' statements at a higher level. 'select' statements at a higher level.
config SND_SOC_SOF_IMX8_SUPPORT config SND_SOC_SOF_IMX8
bool "SOF support for i.MX8" tristate "SOF support for i.MX8"
depends on IMX_SCU=y || IMX_SCU=SND_SOC_SOF_IMX_OF depends on IMX_SCU
depends on IMX_DSP=y || IMX_DSP=SND_SOC_SOF_IMX_OF depends on IMX_DSP
select SND_SOC_SOF_IMX_COMMON
help help
This adds support for Sound Open Firmware for NXP i.MX8 platforms. This adds support for Sound Open Firmware for NXP i.MX8 platforms.
Say Y if you have such a device. Say Y if you have such a device.
If unsure select "N". If unsure select "N".
config SND_SOC_SOF_IMX8 config SND_SOC_SOF_IMX8M
tristate tristate "SOF support for i.MX8M"
depends on IMX_DSP
select SND_SOC_SOF_IMX_COMMON select SND_SOC_SOF_IMX_COMMON
select SND_SOC_SOF_XTENSA
select SND_SOC_SOF_COMPRESS
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level.
config SND_SOC_SOF_IMX8M_SUPPORT
bool "SOF support for i.MX8M"
depends on IMX_DSP=y || IMX_DSP=SND_SOC_SOF_OF
help help
This adds support for Sound Open Firmware for NXP i.MX8M platforms. This adds support for Sound Open Firmware for NXP i.MX8M platforms.
Say Y if you have such a device. Say Y if you have such a device.
If unsure select "N". If unsure select "N".
config SND_SOC_SOF_IMX8M endif ## SND_SOC_SOF_IMX_TOPLEVEL
tristate
select SND_SOC_SOF_IMX_COMMON
select SND_SOC_SOF_XTENSA
select SND_SOC_SOF_COMPRESS
help
This option is not user-selectable but automagically handled by
'select' statements at a higher level.
endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL