Update SDCA Kconfig
Subsystems (3)
Charles Keepax
maintainerv2 cover Update SDCA Kconfig
Tidy up a bunch of makefile and Kconfig things, and pull the HID and IRQ into the main SDCA module.
Changes since v1:
- Don't expose SND_SOC_SDCA to the user
- Simplify the makefile bits for HID and IRQ
Thanks,
Charles
Charles Keepax (2):
ASoC: SDCA: Kconfig/Makefile fixups
ASoC: SDCA: Pull HID and IRQ into the primary SDCA module
sound/soc/sdca/Kconfig | 13 +++++++++---- sound/soc/sdca/Makefile | 12 ++++-------- sound/soc/sdca/sdca_functions.c | 1 - sound/soc/sdca/sdca_hid.c | 2 +- sound/soc/sdca/sdca_interrupts.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-)
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v2 1/2 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.
---
Changes since v1:
- Don't expose SND_SOC_SDCA to the user.
sound/soc/sdca/Kconfig | 13 +++++++++---- sound/soc/sdca/Makefile | 10 ++++++---- 2 files changed, 15 insertions(+), 8 deletions(-)
sound/soc/sdca/Kconfig +9 -4
@@ -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
sound/soc/sdca/Makefile +6 -4
@@ -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
Signature · 1 line
2.39.5
Re: [PATCH v2 1/2] ASoC: SDCA: Kconfig/Makefile fixups
Quoted 8 lines · Charles Keepax
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 <[email protected]>
Charles Keepax
maintainerPATCH v2 2/2 ASoC: SDCA: Pull HID and IRQ into the primary SDCA module
In reply to Charles KeepaxIf the HID or the IRQ are selected as options they will always require loading alongside the main SDCA module. Since it will never be possible to run without them the value of keeping them as separate modules is fairly limited. Pull them into the main SDCA module to simplify things still further.
---
Changes since v1:
- Simplify Makefile bits for HID/IRQ
sound/soc/sdca/Makefile | 10 ++-------- sound/soc/sdca/sdca_functions.c | 1 - sound/soc/sdca/sdca_hid.c | 2 +- sound/soc/sdca/sdca_interrupts.c | 8 ++++---- 4 files changed, 7 insertions(+), 14 deletions(-)
sound/soc/sdca/Makefile +2 -8
@@ -1,13 +1,7 @@ # 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-hid-y := sdca_hid.o -snd-soc-sdca-irq-y := sdca_interrupts.o +snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_HID) += sdca_hid.o +snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.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 -endif -ifdef CONFIG_SND_SOC_SDCA_IRQ -obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca-irq.o -endif
sound/soc/sdca/sdca_functions.c +0 -1
@@ -1943,4 +1943,3 @@ EXPORT_SYMBOL_NS(sdca_parse_function, "SND_SOC_SDCA");MODULE_LICENSE ("Dual BSD/GPL" );MODULE_DESCRIPTION ("SDCA library" ); -MODULE_IMPORT_NS ("SND_SOC_SDCA_HID" );
sound/soc/sdca/sdca_hid.c +1 -1
@@ -121,7 +121,7 @@ int sdca_add_hid_device(struct device *dev, struct sdca_entity *entity)return 0 ; } -EXPORT_SYMBOL_NS (sdca_add_hid_device,"SND_SOC_SDCA_HID" ); +EXPORT_SYMBOL_NS (sdca_add_hid_device,"SND_SOC_SDCA" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_DESCRIPTION ("SDCA HID library" );
sound/soc/sdca/sdca_interrupts.c +4 -4
@@ -279,7 +279,7 @@ int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *info,return 0 ; } -EXPORT_SYMBOL_NS_GPL (sdca_irq_request,"SND_SOC_SDCA_IRQ" ); +EXPORT_SYMBOL_NS_GPL (sdca_irq_request,"SND_SOC_SDCA" );/** * sdca_irq_data_populate - Populate common interrupt data
@@ -313,7 +313,7 @@ int sdca_irq_data_populate(struct snd_soc_component *component,return 0 ; } -EXPORT_SYMBOL_NS_GPL (sdca_irq_data_populate,"SND_SOC_SDCA_IRQ" ); +EXPORT_SYMBOL_NS_GPL (sdca_irq_data_populate,"SND_SOC_SDCA" );/** * sdca_irq_populate - Request all the individual IRQs for an SDCA Function
@@ -393,7 +393,7 @@ int sdca_irq_populate(struct sdca_function_data *function,return 0 ; } -EXPORT_SYMBOL_NS_GPL (sdca_irq_populate,"SND_SOC_SDCA_IRQ" ); +EXPORT_SYMBOL_NS_GPL (sdca_irq_populate,"SND_SOC_SDCA" );/** * sdca_irq_allocate - allocate an SDCA interrupt structure for a device
@@ -433,7 +433,7 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,return info; } -EXPORT_SYMBOL_NS_GPL (sdca_irq_allocate,"SND_SOC_SDCA_IRQ" ); +EXPORT_SYMBOL_NS_GPL (sdca_irq_allocate,"SND_SOC_SDCA" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("SDCA IRQ library" );
Signature · 1 line
2.39.5
Re: [PATCH v2 2/2] ASoC: SDCA: Pull HID and IRQ into the primary SDCA module
Quoted 7 lines · Charles Keepax
If the HID or the IRQ are selected as options they will always require loading alongside the main SDCA module. Since it will never be possible to run without them the value of keeping them as separate modules is fairly limited. Pull them into the main SDCA module to simplify things still further.
Signed-off-by Charles Keepax <[email protected]>
Mark Brown
maintainerQuoted 8 lines · Charles Keepax
Tidy up a bunch of makefile and
Kconfigthings, and pull the HID and IRQ into the main SDCA module.Changes since v1:
- Don't exposeSND_SOC_SDCAto the user
- Simplify the makefile bits for HID and IRQ[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: SDCA: Kconfig/Makefile fixups
commit: 6894e49b7b62cdb0edbcaaa23ea0218edb3b02dd
[2/2] ASoC: SDCA: Pull HID and IRQ into the primary SDCA module
commit: 5030abcb0aa3304bf91497844ffa9607a2d4ad5dAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark