Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:01 +0100
commit9ed9fc3dcf64be72ee919226a7637bb9be83b9e6 (patch)
treed1d1ce803a94f900266303ddf734f02634c53e24
parent9ee6fb8269e1fb4ab4bbfebacb334ecf4cf922c7 (diff)
pinctrl: cherryview: fix Strago DMI workaround (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch70
-rw-r--r--series.conf1
2 files changed, 71 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch b/patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch
new file mode 100644
index 0000000000..3dfc25497c
--- /dev/null
+++ b/patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch
@@ -0,0 +1,70 @@
+From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Date: Mon, 14 Jan 2019 19:38:36 -0800
+Subject: [PATCH] pinctrl: cherryview: fix Strago DMI workaround
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: e3f72b749da2bf63bed7409e416f160418d475b6
+
+commit e3f72b749da2bf63bed7409e416f160418d475b6 upstream.
+
+Well, hopefully 3rd time is a charm. We tried making that check
+DMI_BIOS_VERSION and DMI_BOARD_VERSION, but the real one is
+DMI_PRODUCT_VERSION.
+
+Fixes: 86c5dd6860a6 ("pinctrl: cherryview: limit Strago DMI workarounds to version 1.0")
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1631930
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
+index 9b0f4b9ef482..8efe8ea45602 100644
+--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
++++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
+@@ -1507,7 +1507,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
+ DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"),
+- DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
+ },
+ },
+ {
+@@ -1515,7 +1515,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Setzer"),
+- DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
+ },
+ },
+ {
+@@ -1523,7 +1523,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"),
+- DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
+ },
+ },
+ {
+@@ -1531,7 +1531,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Celes"),
+- DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"),
+ },
+ },
+ {}
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 263916ceea..233a930106 100644
--- a/series.conf
+++ b/series.conf
@@ -1102,6 +1102,7 @@
patches.kernel.org/4.20.9-017-debugfs-fix-debugfs_rename-parameter-checking.patch
patches.kernel.org/4.20.9-018-svcrdma-Remove-max_sge-check-at-connect-time.patch
patches.kernel.org/4.20.9-019-pinctrl-sunxi-Correct-number-of-IRQ-banks-on-H.patch
+ patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch
########################################################
# Build fixes that apply to the vanilla kernel too.