Unverified Commit e977f381 authored by Mark Brown's avatar Mark Brown
Browse files

Update SDCA Kconfig 

Merge series from Charles Keepax <ckeepax@opensource.cirrus.com>:

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(-)

--
2.39.5
parents 5f120ccf 5030abcb

sound/soc/sdca/Kconfig

+9 −4
Original line number Diff line number Diff line
@@ -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

+4 −8
Original line number Diff line number Diff line 
# 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

obj-$(CONFIG_SND_SOC_SDCA_IRQ)	+= snd-soc-sdca-irq.o

sound/soc/sdca/sdca_functions.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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");