diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-29 18:15:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-29 18:15:57 +0300 |
| commit | 9b4f41684b239eedac96913270db4a5669956671 (patch) | |
| tree | cb9b4800c3d6b93bc4af31fa3e377933c68f9bb2 /include/sound | |
| parent | 2da01ca3674c6e90dbeeda02168849e2ec877edc (diff) | |
| parent | bda16500dd0b05e2e047093b36cbe0873c95aeae (diff) | |
| download | linux-9b4f41684b239eedac96913270db4a5669956671.tar.xz | |
ASoC: Merge up fixes
Some new SOF changes depend on the fixes there.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/cs35l56.h | 2 | ||||
| -rw-r--r-- | include/sound/tas2781-tlv.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index e0629699b563..1a3c6f66f620 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -267,6 +267,7 @@ struct cs35l56_base { bool fw_patched; bool secured; bool can_hibernate; + bool fw_owns_asp1; bool cal_data_valid; s8 cal_index; struct cirrus_amp_cal_data cal_data; @@ -283,6 +284,7 @@ extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC]; extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC]; int cs35l56_set_patch(struct cs35l56_base *cs35l56_base); +int cs35l56_init_asp1_regs_for_driver_control(struct cs35l56_base *cs35l56_base); int cs35l56_force_sync_asp1_registers_from_cache(struct cs35l56_base *cs35l56_base); int cs35l56_mbox_send(struct cs35l56_base *cs35l56_base, unsigned int command); int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base); diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h index 4038dd421150..1dc59005d241 100644 --- a/include/sound/tas2781-tlv.h +++ b/include/sound/tas2781-tlv.h @@ -15,7 +15,7 @@ #ifndef __TAS2781_TLV_H__ #define __TAS2781_TLV_H__ -static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); #endif |