[PATCH 6/7] of/device: Allow I2C devices to OF match without supplying an OF node
From: Lee Jones <hidden>
Date: 2014-06-04 12:11:08
Also in:
linux-devicetree, linux-i2c, lkml
Subsystem:
open firmware and flattened device tree, the rest · Maintainers:
Rob Herring, Saravana Kannan, Linus Torvalds
The I2C framework supplies a means for devices to be registered without the requirement for platform_data, DT or ACPI. The current solution is that every single I2C device in the kernel is forced to supply a normally empty/sparse I2C ID table so the I2C subsystem can match to. In an effort to a) rid the kernel of these tables and b) generify all (OF, ACPI and I2C) matching we need to provide some temporary work arounds until we can straighten out the blocking factors. This change is meant to be temporary and will be stripped out once we've converted all I2C device drivers from of_match_device() over to the new generic match_device(). Signed-off-by: Lee Jones <redacted> --- drivers/of/device.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/of/device.c b/drivers/of/device.c
index dafb973..28913bf 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c@@ -1,6 +1,7 @@ #include <linux/string.h> #include <linux/kernel.h> #include <linux/of.h> +#include <linux/i2c.h> #include <linux/of_device.h> #include <linux/init.h> #include <linux/module.h>
@@ -21,9 +22,22 @@ const struct of_device_id *of_match_device(const struct of_device_id *matches, const struct device *dev) { + const struct of_device_id *match; + if ((!matches) || (!dev->of_node)) return NULL; - return of_match_node(matches, dev->of_node); + + match = of_match_node(matches, dev->of_node); + if (match) + return match; + + /* + * Low impact workaround, until we can convert all I2C compatible + * strings over to the correctly specified <vendor>,<device> format. + */ + match = i2c_of_match_device_strip_vendor(matches, (struct device *)dev); + + return match; } EXPORT_SYMBOL(of_match_device);
--
1.8.3.2