diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-08-09 09:58:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-08-09 09:58:07 +0200 |
| commit | d3e82ced462b4ed956504b62603a11d52a599f99 (patch) | |
| tree | 3bd5edce4ea597f3a9fe1da9354b36c7bfe5a270 /include/sound | |
| parent | 03898691d42e0170e7d00f07cbe21ce0e9f3a8fa (diff) | |
| parent | 72776774b55bb59b7b1b09117e915a5030110304 (diff) | |
| download | lwn-d3e82ced462b4ed956504b62603a11d52a599f99.tar.gz lwn-d3e82ced462b4ed956504b62603a11d52a599f99.zip | |
Merge tag 'asoc-fix-v6.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.11
Quite a lot of fixes have come in since the merge window, there's some
repetitive fixes over the Qualcomm drivers increasing the patch count,
along with a large batch of fixes from Cirrus. We also have some quirks
and some individual fixes.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/cs35l56.h | 5 | ||||
| -rw-r--r-- | include/sound/soc-component.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index a6aa112e5741..a51acefa785f 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -277,6 +277,11 @@ static inline int cs35l56_force_sync_asp1_registers_from_cache(struct cs35l56_ba return 0; } +static inline bool cs35l56_is_otp_register(unsigned int reg) +{ + return (reg >> 16) == 3; +} + extern struct regmap_config cs35l56_regmap_i2c; extern struct regmap_config cs35l56_regmap_spi; extern struct regmap_config cs35l56_regmap_sdw; diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index ceca69b46a82..bf2e381cd124 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -462,6 +462,11 @@ int snd_soc_component_force_enable_pin_unlocked( const char *pin); /* component controls */ +struct snd_kcontrol *snd_soc_component_get_kcontrol(struct snd_soc_component *component, + const char * const ctl); +struct snd_kcontrol * +snd_soc_component_get_kcontrol_locked(struct snd_soc_component *component, + const char * const ctl); int snd_soc_component_notify_control(struct snd_soc_component *component, const char * const ctl); |