Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / pci / hda / cs35l41_hda.h

diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h
index 7495100..a52ffd1 100644 (file)
--- a/sound/pci/hda/cs35l41_hda.h
+++ b/sound/pci/hda/cs35l41_hda.h
@@ -27,39 +27,18 @@ enum cs35l41_hda_gpio_function {
        CS35l41_SYNC,
 };
 
-struct cs35l41_hda_reg_sequence {
-       const struct reg_sequence *probe;
-       unsigned int num_probe;
-       const struct reg_sequence *open;
-       unsigned int num_open;
-       const struct reg_sequence *prepare;
-       unsigned int num_prepare;
-       const struct reg_sequence *cleanup;
-       unsigned int num_cleanup;
-       const struct reg_sequence *close;
-       unsigned int num_close;
-};
-
-struct cs35l41_hda_hw_config {
-       unsigned int spk_pos;
-       unsigned int gpio1_func;
-       unsigned int gpio2_func;
-       int bst_ind;
-       int bst_ipk;
-       int bst_cap;
-};
-
 struct cs35l41_hda {
        struct device *dev;
        struct regmap *regmap;
        struct gpio_desc *reset_gpio;
-       const struct cs35l41_hda_reg_sequence *reg_seq;
+       struct cs35l41_hw_cfg hw_cfg;
 
        int irq;
        int index;
-
-       /* Don't put the AMP in reset of VSPK can not be turned off */
-       bool vspk_always_on;
+       int channel_index;
+       unsigned volatile long irq_errors;
+       const char *amp_name;
+       struct regmap_irq_chip_data *irq_data;
 };
 
 int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,