ASoC: SDCA: Kconfig/Makefile fixups

Tidy up a few bits of the SDCA Kconfig. Default both HID and IRQ to
enabled, since typically if one wants SDCA all the functionality
will be expected.

Finally, update the IRQ support to match the changes made to the
HID support.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20250711100616.296329-2-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sdca/Kconfig b/sound/soc/sdca/Kconfig
index 2253a300dcc35f1c8b4719ed5740d94a91003d1e..6a3ba43f26bd9e7d418ad67eaba0f6cbe314a03c 100644 (file)
--- a/sound/soc/sdca/Kconfig
+++ b/sound/soc/sdca/Kconfig
@@ -8,19 +8,24 @@ config SND_SOC_SDCA
          This option enables support for the MIPI SoundWire Device
          Class for Audio (SDCA).
 
-config SND_SOC_SDCA_OPTIONAL
-       def_tristate SND_SOC_SDCA || !SND_SOC_SDCA
-
 config SND_SOC_SDCA_HID
        bool "SDCA HID support"
        depends on SND_SOC_SDCA
        depends on HID=y || HID=SND_SOC_SDCA
+       default y
+       help
+         This option enables support for audio jack button reporting using HID.
 
 config SND_SOC_SDCA_IRQ
-       tristate
+       bool "SDCA IRQ support"
        select REGMAP
        select REGMAP_IRQ
+       depends on SND_SOC_SDCA
+       default y
        help
          This option enables support for SDCA IRQs.
 
+config SND_SOC_SDCA_OPTIONAL
+       def_tristate SND_SOC_SDCA || !SND_SOC_SDCA
+
 endmenu

diff --git a/sound/soc/sdca/Makefile b/sound/soc/sdca/Makefile
index 1efc869c6cbc3827384098392b890b5167fed262..58a8f3ef3feb292aa805d78d83fcc5e809990421 100644 (file)
--- a/sound/soc/sdca/Makefile
+++ b/sound/soc/sdca/Makefile
@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o
+snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o
 snd-soc-sdca-hid-y := sdca_hid.o
 snd-soc-sdca-irq-y := sdca_interrupts.o
 
-obj-$(CONFIG_SND_SOC_SDCA)     += snd-soc-sdca.o
+obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca.o
 ifdef CONFIG_SND_SOC_SDCA_HID
-obj-$(CONFIG_SND_SOC_SDCA)     += snd-soc-sdca-hid.o
+obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca-hid.o
+endif
+ifdef CONFIG_SND_SOC_SDCA_IRQ
+obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca-irq.o
 endif
-obj-$(CONFIG_SND_SOC_SDCA_IRQ) += snd-soc-sdca-irq.o