Merge tag 'sound-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / include / sound / cs35l56.h

diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index b24716a..e062969 100644 (file)
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -12,6 +12,7 @@
 #include <linux/firmware/cirrus/cs_dsp.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regmap.h>
+#include <sound/cs-amp-lib.h>
 
 #define CS35L56_DEVID                                  0x0000000
 #define CS35L56_REVID                                  0x0000004
@@ -23,6 +24,9 @@
 #define CS35L56_BLOCK_ENABLES2                         0x000201C
 #define CS35L56_REFCLK_INPUT                           0x0002C04
 #define CS35L56_GLOBAL_SAMPLE_RATE                     0x0002C0C
+#define CS35L56_OTP_MEM_53                             0x00300D4
+#define CS35L56_OTP_MEM_54                             0x00300D8
+#define CS35L56_OTP_MEM_55                             0x00300DC
 #define CS35L56_ASP1_ENABLES1                          0x0004800
 #define CS35L56_ASP1_CONTROL1                          0x0004804
 #define CS35L56_ASP1_CONTROL2                          0x0004808
@@ -257,11 +261,15 @@ struct cs35l56_base {
        struct regmap *regmap;
        int irq;
        struct mutex irq_lock;
+       u8 type;
        u8 rev;
        bool init_done;
        bool fw_patched;
        bool secured;
        bool can_hibernate;
+       bool cal_data_valid;
+       s8 cal_index;
+       struct cirrus_amp_cal_data cal_data;
        struct gpio_desc *reset_gpio;
 };
 
@@ -269,6 +277,8 @@ extern struct regmap_config cs35l56_regmap_i2c;
 extern struct regmap_config cs35l56_regmap_spi;
 extern struct regmap_config cs35l56_regmap_sdw;
 
+extern const struct cirrus_amp_cal_controls cs35l56_calibration_controls;
+
 extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];
 extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];
 
@@ -286,6 +296,7 @@ int cs35l56_is_fw_reload_needed(struct cs35l56_base *cs35l56_base);
 int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base);
 int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_soundwire);
 void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
+int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base);
 int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,
                             bool *fw_missing, unsigned int *fw_version);
 int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);