Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: cherryview: fix Strago DMI workaround

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>

authored by

Dmitry Torokhov and committed by
Linus Walleij
e3f72b74 ca443844

+4 -4
+4 -4
drivers/pinctrl/intel/pinctrl-cherryview.c
··· 1513 1513 .matches = { 1514 1514 DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), 1515 1515 DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), 1516 - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), 1516 + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), 1517 1517 }, 1518 1518 }, 1519 1519 { ··· 1521 1521 .matches = { 1522 1522 DMI_MATCH(DMI_SYS_VENDOR, "HP"), 1523 1523 DMI_MATCH(DMI_PRODUCT_NAME, "Setzer"), 1524 - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), 1524 + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), 1525 1525 }, 1526 1526 }, 1527 1527 { ··· 1529 1529 .matches = { 1530 1530 DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), 1531 1531 DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"), 1532 - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), 1532 + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), 1533 1533 }, 1534 1534 }, 1535 1535 { ··· 1537 1537 .matches = { 1538 1538 DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), 1539 1539 DMI_MATCH(DMI_PRODUCT_NAME, "Celes"), 1540 - DMI_MATCH(DMI_BOARD_VERSION, "1.0"), 1540 + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), 1541 1541 }, 1542 1542 }, 1543 1543 {}