ASoC: SOF: i.MX: simplify Kconfig

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>

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 041c54639c4d9a220607770daf84e365158eb7cb..b6fa659179b6026028f6cbb3dd099b4226412398 100644 (file)
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -40,12 +40,14 @@ config SND_SOC_SOF_ACPI_DEV
 config SND_SOC_SOF_OF
        tristate "SOF OF enumeration support"
        depends on OF || COMPILE_TEST
-       select SND_SOC_SOF
        help
          This adds support for Device Tree enumeration. This option is
          required to enable i.MX8 devices.
          Say Y if you need this option. If unsure select "N".
 
+config SND_SOC_SOF_OF_DEV
+       tristate
+
 config SND_SOC_SOF_COMPRESS
        bool
        select SND_SOC_COMPRESS

diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile
index 06e5f49f7ee8615923c62992be803f9aa391b2c6..1dac5cb4dfd647f37af2c3becf8f7d310cb2bb53 100644 (file)
--- a/sound/soc/sof/Makefile
+++ b/sound/soc/sof/Makefile
@@ -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_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_INTEL_TOPLEVEL) += intel/

diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
index 34cf228c188f93c1765de3ee0993c30085d4c07d..9b8d5bb1e4491d245792991f21b44b490b9f499f 100644 (file)
--- a/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@ -11,53 +11,33 @@ config 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
        tristate
+       select SND_SOC_SOF_OF_DEV
+       select SND_SOC_SOF
+       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_IMX8_SUPPORT
-       bool "SOF support for i.MX8"
-       depends on IMX_SCU=y || IMX_SCU=SND_SOC_SOF_IMX_OF
-       depends on IMX_DSP=y || IMX_DSP=SND_SOC_SOF_IMX_OF
+config SND_SOC_SOF_IMX8
+       tristate "SOF support for i.MX8"
+       depends on IMX_SCU
+       depends on IMX_DSP
+       select SND_SOC_SOF_IMX_COMMON
        help
          This adds support for Sound Open Firmware for NXP i.MX8 platforms.
          Say Y if you have such a device.
          If unsure select "N".
 
-config SND_SOC_SOF_IMX8
-       tristate
+config SND_SOC_SOF_IMX8M
+       tristate "SOF support for i.MX8M"
+       depends on IMX_DSP
        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
          This adds support for Sound Open Firmware for NXP i.MX8M platforms.
          Say Y if you have such a device.
          If unsure select "N".
 
-config SND_SOC_SOF_IMX8M
-       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
+endif ## SND_SOC_SOF_IMX_TOPLEVEL