Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / sound / soc / codecs / rt286.c

diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 74c0e4eb3788dca775f17207c6c7fb35f5629cab..7899a2cdeb42f46c5d76cd051319a4b547b1ed04 100644 (file)
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1053,12 +1053,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt286 = {
        .resume = rt286_resume,
        .set_bias_level = rt286_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt286_snd_controls,
-       .num_controls = ARRAY_SIZE(rt286_snd_controls),
-       .dapm_widgets = rt286_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt286_dapm_widgets),
-       .dapm_routes = rt286_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt286_dapm_routes),
+       .component_driver = {
+               .controls               = rt286_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt286_snd_controls),
+               .dapm_widgets           = rt286_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt286_dapm_widgets),
+               .dapm_routes            = rt286_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt286_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt286_regmap = {
@@ -1106,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")
+               }
+       },
 
        { }
 };