diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-04 13:15:32 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-04 13:16:30 +0300 |
commit | 664bc5c55923712a8aabd2a390ed7477325e32df (patch) | |
tree | 6382fd31d0fab7699fb2ff6b0501275700dd5b85 /sound/pci/hda/patch_si3054.c | |
parent | ffda568e8b4979c6a04bbdd92acfd93b5dc5e163 (diff) | |
parent | 9d82f9272ddd8492afdd721c9999171741be835b (diff) | |
download | linux-664bc5c55923712a8aabd2a390ed7477325e32df.tar.xz |
Merge branch 'topic/hda-regmap' into for-next
This merges the support of regmap in HD-audio infrastructure.
Many in-house cache codes in HD-audio driver are relaced with the
more standard regmap base now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_si3054.c')
-rw-r--r-- | sound/pci/hda/patch_si3054.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c index 49b4868797a5..5104bebb2286 100644 --- a/sound/pci/hda/patch_si3054.c +++ b/sound/pci/hda/patch_si3054.c @@ -222,6 +222,10 @@ static int si3054_init(struct hda_codec *codec) unsigned wait_count; u16 val; + if (snd_hdac_regmap_add_vendor_verb(&codec->core, + SI3054_VERB_WRITE_NODE)) + return -ENOMEM; + snd_hda_codec_write(codec, AC_NODE_ROOT, 0, AC_VERB_SET_CODEC_RESET, 0); snd_hda_codec_write(codec, codec->core.mfg, 0, AC_VERB_SET_STREAM_FORMAT, 0); SET_REG(codec, SI3054_LINE_RATE, 9600); |