pinctrl: cherryview: fix Strago DMI workaround

PATCH In review Dmitry Torokhov 4 participants 4 messages Jan 15, 2019 – Jan 21, 2019

Subsystems (3)

GPIO Pin control Pin controller - Intel

lore

Share & tools

lore

Dmitry Torokhov

author

2019-01-15 03:38 UTC #0 lore raw

PATCH 1/1 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 [email protected]

Signed-off-by Dmitry Torokhov <[email protected]>

---
 drivers/pinctrl/intel/pinctrl-cherryview.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/pinctrl/intel/pinctrl-cherryview.c +4 -4

index 9b0f4b9ef482..8efe8ea45602 100644
@@ -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"),
 		},
 	},
 	{}

Signature · 5 lines

2.20.1.97.g81188d93c3-goog


-- 
Dmitry

Andy Shevchenko

Reviewed-by on v1 1/1

2019-01-15 05:32 UTC #1 lore raw

Quoted 3 lines · Dmitry Torokhov

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.

Reviewed-by Andy Shevchenko <[email protected]>

Quoted 55 lines

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 [email protected]

Signed-off-by Dmitry Torokhov <[email protected]>

---
 drivers/pinctrl/intel/pinctrl-cherryview.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/pinctrl/intel/pinctrl-cherryview.c +4 -4

index 9b0f4b9ef482..8efe8ea45602 100644
@@ -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"),
 		},
 	},
 	{}

Signature · 5 lines

2.20.1.97.g81188d93c3-goog


-- 
Dmitry

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Mika Westerberg

maintainer Acked-by

2019-01-21 11:12 UTC #2 lore raw

Quoted 6 lines · Andy Shevchenko

Quoted 3 lines · Dmitry Torokhov
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.
Reviewed-by Andy Shevchenko <[email protected]>

Also,

Acked-by Mika Westerberg <[email protected]>

Linus Walleij

2019-01-21 12:06 UTC #3 lore raw

In reply to Dmitry Torokhov

Quoted 9 lines · Dmitry Torokhov

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 [email protected]
Signed-off-by Dmitry Torokhov <[email protected]>

Patch applied for fixes with the ACKs!

Yours,
Linus Walleij