projects
/
wrapfs-4.14.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc68f0c
)
ASoC: rt5682: Fix the fast discharge for headset unplugging in soundwire mode
author
Oder Chiou
<oder_chiou@realtek.com>
Fri, 4 Jun 2021 06:31:50 +0000
(14:31 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 23 Jun 2021 12:44:04 +0000
(14:44 +0200)
[ Upstream commit
49783c6f4a4f49836b5a109ae0daf2f90b0d7713
]
Based on ("
5a15cd7fce20b1fd4aece6a0240e2b58cd6a225d
"), the setting also
should be set in soundwire mode.
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Link:
https://lore.kernel.org/r/20210604063150.29925-1-oder_chiou@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/rt5682-sdw.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/rt5682-sdw.c
b/sound/soc/codecs/rt5682-sdw.c
index b49f1e16125d49676ada14347c2cbfe8d00f356e..d1dd7f720ba48a19b0b047d124c3cc9d6c81c413 100644
(file)
--- a/
sound/soc/codecs/rt5682-sdw.c
+++ b/
sound/soc/codecs/rt5682-sdw.c
@@
-462,7
+462,8
@@
static int rt5682_io_init(struct device *dev, struct sdw_slave *slave)
regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_2,
RT5682_EXT_JD_SRC, RT5682_EXT_JD_SRC_MANUAL);
- regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd042);
+ regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd142);
+ regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_5, 0x0700, 0x0600);
regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_3,
RT5682_CBJ_IN_BUF_EN, RT5682_CBJ_IN_BUF_EN);
regmap_update_bits(rt5682->regmap, RT5682_SAR_IL_CMD_1,