Skip to contentSkip to conversation

i2c: designware: platdrv: Set class based on DMI

PATCH Superseded Ricardo Ribalda 2 participants 2 messages Jul 2, 2020

Subsystems (3)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 i2c: designware: platdrv: Set class based on DMI

Current AMD's zen-based APUs use this core for some of its i2c-buses.

With this patch we re-enable autodetection of hwmon-alike devices, so lm-sensors will be able to work automatically.

It does not affect the boot-time of embedded devices, as the class is set based on the DMI information.

DMI is probed only on Qtechnology QT5222 Industrial Camera Platform

DocLink: https://qtec.com/camera-technology-camera-platforms/

Fixes 3eddad96c439 ("i2c: designware: reverts "i2c: designware: Add support for AMD I2C controller"")

---
v2: Comments by Andy Shevchenko <[email protected]>
- dmi -> DMI
- Doclink
- CodeStyle
(I do not know what you meant by redundant in the dmi match list ...)

 drivers/i2c/busses/i2c-designware-platdrv.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-platdrv.c +15 -1
index c2efaaaac252..630e28ef2412 100644
@@ -12,6 +12,7 @@
 #include <linux/clk-provider.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
@@ -191,6 +192,18 @@ static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev)
 	return ret;
 }
 
+static const struct dmi_system_id dw_i2c_hwmon_class_dmi[] = {
+	{
+		.ident = "Qtechnology QT5222",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Qtechnology"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "QT5222"),
+		},
+	},
+
+	{ } /* terminate list */
+};
+
 static int dw_i2c_plat_probe(struct platform_device *pdev)
 {
 	struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -267,7 +280,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 
 	adap = &dev->adapter;
 	adap->owner = THIS_MODULE;
-	adap->class = I2C_CLASS_DEPRECATED;
+	adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ?
+					I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED;
 	ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
 	adap->dev.of_node = pdev->dev.of_node;
 	adap->nr = -1;
Signature · 1 line
2.27.0
reviewer Reviewed-by on v4 1/1
#1 lore raw
Quoted 7 lines · Ricardo Ribalda

Current AMD's zen-based APUs use this core for some of its i2c-buses.

With this patch we re-enable autodetection of hwmon-alike devices, so lm-sensors will be able to work automatically.

It does not affect the boot-time of embedded devices, as the class is set based on the DMI information.

Thanks for an update, my comments below. Either Wolfram (if he is okay with that), or you can address them.

After addressing,

Quoted 1 line

DMI is probed only on Qtechnology QT5222 Industrial Camera Platform

Still missed period at the end.

Quoted 30 lines

DocLink: https://qtec.com/camera-technology-camera-platforms/

Fixes 3eddad96c439 ("i2c: designware: reverts "i2c: designware: Add support for AMD I2C controller"")

---
v2: Comments by Andy Shevchenko <[email protected]>
- dmi -> DMI
- Doclink
- CodeStyle
(I do not know what you meant by redundant in the dmi match list ...)

 drivers/i2c/busses/i2c-designware-platdrv.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-platdrv.c +1 -0
index c2efaaaac252..630e28ef2412 100644
@@ -12,6 +12,7 @@
 #include <linux/clk-provider.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
@@ -191,6 +192,18 @@ static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev)
 	return ret;
 }
 

drivers/i2c/busses/i2c-designware-platdrv.c static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) · line 204

Quoted 10 lines
drivers/i2c/busses/i2c-designware-platdrv.c +9 -0
+static const struct dmi_system_id dw_i2c_hwmon_class_dmi[] = {
+	{
+		.ident = "Qtechnology QT5222",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Qtechnology"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "QT5222"),
+		},
+	},
 
+

Still not needed blank line.

Quoted 19 lines
drivers/i2c/busses/i2c-designware-platdrv.c +3 -0
+	{ } /* terminate list */
+};
+
 static int dw_i2c_plat_probe(struct platform_device *pdev)
 {
drivers/i2c/busses/i2c-designware-platdrv.c +2 -1
 	struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -267,7 +280,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 
 	adap = &dev->adapter;
 	adap->owner = THIS_MODULE;
-	adap->class = I2C_CLASS_DEPRECATED;
+	adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ?
+					I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED;
 	ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
 	adap->dev.of_node = pdev->dev.of_node;
 	adap->nr = -1;
Signature · 1 line
2.27.0
Signature · 2 lines
With Best Regards,
Andy Shevchenko