aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-08-21 09:02:28 +0200
committerTakashi Iwai <tiwai@suse.de>2025-08-21 09:02:28 +0200
commit279eb50aa8b6b6b69a57a2a7f0bba24dda44f102 (patch)
tree4e925cd39cf1feb7dd5e7c209794226d14f12fc9 /include/sound
parentALSA: hda: tas2781: Fix wrong reference of tasdevice_priv (diff)
parentASoC: cs35l56: Fixes for CS35L63 for production (diff)
downloadlinux-279eb50aa8b6b6b69a57a2a7f0bba24dda44f102.tar.gz
linux-279eb50aa8b6b6b69a57a2a7f0bba24dda44f102.zip
Merge tag 'asoc-fix-v6.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.17 A few fixes that came in during the past week, there's some updates for the CS35L56 which adjust the driver for production silicon and a fix for buggy resume of the ES9389.
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/cs35l56.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index e17c4cadd04d..7c8bbe8ad1e2 100644
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -107,8 +107,8 @@
#define CS35L56_DSP1_PMEM_5114 0x3804FE8
#define CS35L63_DSP1_FW_VER CS35L56_DSP1_FW_VER
-#define CS35L63_DSP1_HALO_STATE 0x280396C
-#define CS35L63_DSP1_PM_CUR_STATE 0x28042C8
+#define CS35L63_DSP1_HALO_STATE 0x2803C04
+#define CS35L63_DSP1_PM_CUR_STATE 0x2804518
#define CS35L63_PROTECTION_STATUS 0x340009C
#define CS35L63_TRANSDUCER_ACTUAL_PS 0x34000F4
#define CS35L63_MAIN_RENDER_USER_MUTE 0x3400020
@@ -306,6 +306,7 @@ struct cs35l56_base {
struct gpio_desc *reset_gpio;
struct cs35l56_spi_payload *spi_payload_buf;
const struct cs35l56_fw_reg *fw_reg;
+ const struct cirrus_amp_cal_controls *calibration_controls;
};
static inline bool cs35l56_is_otp_register(unsigned int reg)