diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-14 16:03:29 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-14 16:03:29 +0300 |
| commit | ca80e26a5995f078aa442f151b94cf4305e07ac4 (patch) | |
| tree | bb1b4a0a6e07f1ed80ff6412eb2a20e621244037 /sound/soc/codecs/rt298.c | |
| parent | 028cb68ee3d01f5323493cb3c07ba92b0acb2f03 (diff) | |
| parent | d4a6360f19c1c551afcba42be98df04651fab31b (diff) | |
| download | linux-ca80e26a5995f078aa442f151b94cf4305e07ac4.tar.xz | |
Merge tag 'asoc-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.6
The main thing in terms of the core this time around has been some
additional framework work for dynamic topologies (though we *still*
don't appear to have a stable ABI for the topology code, it's probably
worth considering if this will ever happen...). Otherwise the work has
almost all been in the drivers:
- HDMI support for Sky Lake, along with other fixes and enhancements
for the Intel drivers.
- Lots of improvements to the Renesas drivers.
- Capture support for Qualcomm drivers.
- Support for TI DaVinci DRA7xxx devices.
- New machine drivers for Freescale systems with Cirrus CODECs,
Mediatek systems with RT5650 CODECs.
- New CPU drivers for Allwinner S/PDIF controllers
- New CODEC drivers for Maxim MAX9867 and MAX98926 and Realtek RT5514.
Diffstat (limited to 'sound/soc/codecs/rt298.c')
| -rw-r--r-- | sound/soc/codecs/rt298.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 30c6de62ae6c..f0e6c06e89ac 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1224,7 +1224,12 @@ static int rt298_i2c_probe(struct i2c_client *i2c, regmap_write(rt298->regmap, RT298_MISC_CTRL1, 0x0000); regmap_update_bits(rt298->regmap, RT298_WIND_FILTER_CTRL, 0x0082, 0x0082); - regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2); + + regmap_write(rt298->regmap, RT298_UNSOLICITED_INLINE_CMD, 0x81); + regmap_write(rt298->regmap, RT298_UNSOLICITED_HP_OUT, 0x82); + regmap_write(rt298->regmap, RT298_UNSOLICITED_MIC1, 0x84); + regmap_update_bits(rt298->regmap, RT298_IRQ_FLAG_CTRL, 0x2, 0x2); + rt298->is_hp_in = -1; if (rt298->i2c->irq) { |