summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifeng Li <tomli@tomli.me>2017-05-04 01:34:14 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-12 16:53:58 +0200
commita6ed89c62d293f9ec4854371d1a4ee33f1df4d8b (patch)
tree4973c12f505998e72115660af09da0bf84d43319
parent471475402812f28d109ac5dc479bd38a168fffdb (diff)
downloadlinux-stable-a6ed89c62d293f9ec4854371d1a4ee33f1df4d8b.tar.gz
linux-stable-a6ed89c62d293f9ec4854371d1a4ee33f1df4d8b.tar.bz2
linux-stable-a6ed89c62d293f9ec4854371d1a4ee33f1df4d8b.zip
rt286: add Thinkpad Helix 2 to force_combo_jack_table
commit fe0dfd6358a17c79bd7d6996af7512ba452a7059 upstream. Thinkpad Helix 2 is a tablet PC, the audio is powered by Core M broadwell-audio and rt286 codec. For all versions of Linux kernel, the stereo output doesn't work properly when earphones are plugged in, the sound was coming out from both channels even if the audio contains only the left or right channel. Furthermore, if a music recorded in stereo is played, the two channels cancle out each other out, as a result, no voice but only distorted background music can be heard, like a sound card with builtin a Karaoke sount effect. Apparently this tablet uses a combo jack with polarity incorrectly set by rt286 driver. This patch adds DMI information of Thinkpad Helix 2 to force_combo_jack_table[] and the issue is resolved. The microphone input doesn't work regardless to the presence of this patch and still needs help from other developers to investigate. This is my first patch to LKML directly, sorry for CC-ing too many people here. Link: https://bugzilla.kernel.org/show_bug.cgi?id=93841 Signed-off-by: Yifeng Li <tomli@tomli.me> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/soc/codecs/rt286.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 9c365a7f758d..7899a2cdeb42 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1108,6 +1108,13 @@ static const struct dmi_system_id force_combo_jack_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform")
}
},
+ {
+ .ident = "Thinkpad Helix 2nd",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix 2nd")
+ }
+ },
{ }
};