diff options
| author | Mark Brown <broonie@kernel.org> | 2024-08-08 10:14:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-08-08 10:14:57 +0200 |
| commit | 1a4f7965016b9685bd158f7f306039ce96d2beb5 (patch) | |
| tree | 2e46d394a3da7e56f1bd5076cd836eaa8f99aef1 /include/sound | |
| parent | ASoC: remove bespoke trigger support (diff) | |
| parent | ASoC: Extend wm_adsp so cs35l56 can suppress controls (diff) | |
| download | linux-1a4f7965016b9685bd158f7f306039ce96d2beb5.tar.xz linux-1a4f7965016b9685bd158f7f306039ce96d2beb5.zip | |
ASoC: Merge fixes
So we can apply AMD patches that rely on them.
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); |