ALSA: hda: cs35l41: Save codec object inside component struct

This is required for ALSA control support.

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220630002335.366545-4-vitalyr@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 1a1afa0725e0210b4201b9cd25b6f518eaecf7df..20d3ce8773dd4d3de4ac11785851014b872ffe52 100644 (file)
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -117,6 +117,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
                return -EBUSY;
 
        comps->dev = dev;
+       cs35l41->codec = comps->codec;
        strscpy(comps->name, dev_name(dev), sizeof(comps->name));
        comps->playback_hook = cs35l41_hda_playback_hook;
 

diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h
index a52ffd1f7999471dd3835ed024315b15669e6324..aaf9e16684c267c2eb4024bf6aa6e3f14f53283f 100644 (file)
--- a/sound/pci/hda/cs35l41_hda.h
+++ b/sound/pci/hda/cs35l41_hda.h
@@ -32,6 +32,7 @@ struct cs35l41_hda {
        struct regmap *regmap;
        struct gpio_desc *reset_gpio;
        struct cs35l41_hw_cfg hw_cfg;
+       struct hda_codec *codec;
 
        int irq;
        int index;

diff --git a/sound/pci/hda/hda_component.h b/sound/pci/hda/hda_component.h
index e26c896a13f3469f961fd732c8f6308318d95196..534e845b9cd1da5deb9b3d0ad96410f37dbb057c 100644 (file)
--- a/sound/pci/hda/hda_component.h
+++ b/sound/pci/hda/hda_component.h
@@ -14,5 +14,6 @@
 struct hda_component {
        struct device *dev;
        char name[HDA_MAX_NAME_SIZE];
+       struct hda_codec *codec;
        void (*playback_hook)(struct device *dev, int action);
 };

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 007dd8b5e1f2f219c6ceb9ce8a688ce7452c9404..44744d568404802778c154a9aab83c2a7e882c76 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6654,6 +6654,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
                                              "%s-%s:00-cs35l41-hda.%d", bus, hid, i);
                        if (!name)
                                return;
+                       spec->comps[i].codec = cdc;
                        component_match_add(dev, &spec->match, component_compare_dev_name, name);
                }
                ret = component_master_add_with_match(dev, &comp_master_ops, spec->match);