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

ASoC: Add SDCA IRQ support and some misc fixups 

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

Add a maintainers entry for SDCA, do a couple of small fixups for
previous chains, and then adding the beginnings of the SDCA IRQ
handling. This is based around a regmap IRQ chip and a few helper
functions that can be called from the client drivers to setup the
IRQs.
parents 29ddce17 b9ab3b61

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -22298,6 +22298,17 @@ M: Jim Cromie <jim.cromie@gmail.com> 
S:	Maintained

F:	drivers/clocksource/scx200_hrt.c









SDCA LIBRARY AND CLASS DRIVER









M:	Charles Keepax <ckeepax@opensource.cirrus.com>









M:	Maciej Strozek <mstrozek@opensource.cirrus.com>









R:	Bard Liao <yung-chuan.liao@linux.intel.com>









R:	Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>









L:	linux-sound@vger.kernel.org









L:	patches@opensource.cirrus.com









S:	Maintained









F:	include/sound/sdca*









F:	sound/soc/sdca/*

















SDRICOH_CS MMC/SD HOST CONTROLLER INTERFACE DRIVER









M:	Sascha Sommer <saschasommer@freenet.de>









L:	sdricohcs-devel@lists.sourceforge.net (subscribers-only)

























include/sound/sdca_function.h



+11
−0






























Original line number
Diff line number
Diff line







@@ -17,6 +17,8 @@ struct device;







struct sdca_entity;









struct sdca_function_desc;



















#define SDCA_NO_INTERRUPT -1



















/*









 * The addressing space for SDCA relies on 7 bits for Entities, so a









 * maximum of 128 Entities per function can be represented.








@@ -319,6 +321,15 @@ enum sdca_selected_mode_range {







	SDCA_SELECTED_MODE_NCOLS			= 2,









};



















/**









 * enum sdca_detected_mode_values - Predefined GE Detected Mode values









 */









enum sdca_detected_mode_values {









	SDCA_DETECTED_MODE_JACK_UNPLUGGED		= 0,









	SDCA_DETECTED_MODE_JACK_UNKNOWN			= 1,









	SDCA_DETECTED_MODE_DETECTION_IN_PROGRESS	= 2,









};



















/**









 * enum sdca_spe_controls - SDCA Controls for Security & Privacy Unit









 *
































include/sound/sdca_interrupts.h
0 → 100644



+78
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 */









/*









 * The MIPI SDCA specification is available for public downloads at









 * https://www.mipi.org/mipi-sdca-v1-0-download









 *









 * Copyright (C) 2025 Cirrus Logic, Inc. and









 *                    Cirrus Logic International Semiconductor Ltd.









 */



















#ifndef __SDCA_INTERRUPTS_H__









#define __SDCA_INTERRUPTS_H__



















#include <linux/interrupt.h>









#include <linux/mutex.h>









#include <linux/regmap.h>



















struct device;









struct snd_soc_component;









struct sdca_function_data;



















#define SDCA_MAX_INTERRUPTS 31 /* the last bit is reserved for future extensions */



















/**









 * struct sdca_interrupt - contains information about a single SDCA interrupt









 * @name: The name of the interrupt.









 * @component: Pointer to the ASoC component owns the interrupt.









 * @function: Pointer to the Function that the interrupt is associated with.









 * @entity: Pointer to the Entity that the interrupt is associated with.









 * @control: Pointer to the Control that the interrupt is associated with.









 * @priv: Pointer to private data for use by the handler.









 * @externally_requested: Internal flag used to check if a client driver has









 * already requested the interrupt, for custom handling, allowing the core to









 * skip handling this interrupt.









 */









struct sdca_interrupt {









	const char *name;



















	struct snd_soc_component *component;









	struct sdca_function_data *function;









	struct sdca_entity *entity;









	struct sdca_control *control;



















	void *priv;



















	bool externally_requested;









};



















/**









 * struct sdca_interrupt_info - contains top-level SDCA interrupt information









 * @irq_chip: regmap irq chip structure.









 * @irq_data: regmap irq chip data structure.









 * @irqs: Array of data for each individual IRQ.









 * @irq_lock: Protects access to the list of sdca_interrupt structures.









 */









struct sdca_interrupt_info {









	struct regmap_irq_chip irq_chip;









	struct regmap_irq_chip_data *irq_data;



















	struct sdca_interrupt irqs[SDCA_MAX_INTERRUPTS];



















	struct mutex irq_lock; /* Protect irqs list across functions */









};



















int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *interrupt_info,









		     int sdca_irq, const char *name, irq_handler_t handler,









		     void *data);









int sdca_irq_data_populate(struct snd_soc_component *component,









			   struct sdca_function_data *function,









			   struct sdca_entity *entity,









			   struct sdca_control *control,









			   struct sdca_interrupt *interrupt);









int sdca_irq_populate(struct sdca_function_data *function,









		      struct snd_soc_component *component,









		      struct sdca_interrupt_info *info);









struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,









					      struct regmap *regmap, int irq);



















#endif
























sound/soc/sdca/Kconfig



+7
−0






























Original line number
Diff line number
Diff line







@@ -15,4 +15,11 @@ config SND_SOC_SDCA_HID







	tristate "SDCA HID support"









	depends on SND_SOC_SDCA && HID



















config SND_SOC_SDCA_IRQ









	tristate









	select REGMAP









	select REGMAP_IRQ









	help









	  This option enables support for SDCA IRQs.



















endmenu
























sound/soc/sdca/Makefile



+3
−2






























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



















obj-$(CONFIG_SND_SOC_SDCA_HID)	+= snd-soc-sdca-hid.o









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









obj-$(CONFIG_SND_SOC_SDCA_HID)	+= snd-soc-sdca-hid.o









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