| Message ID | 1402069952-28022-8-git-send-email-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, 6 Jun 2014 16:52:30 +0100, Lee Jones <lee.jones@linaro.org> wrote: > 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 rid the kernel of these tables 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 I2C generic i2c_of_match_device(). This change imposes the i2c workaround onto every single caller of i2c_of_match_device(), regardless of subsystem, and regardless of the desired behaviour. It also prevents an i2c driver from getting the correct behavour when it wants it. So, no, I'm not okay with hooking into the core code to work around the subsystem problem. I2C drivers need to call the i2c specific version directly. I know that adds a line of change to the driver patches, but I think it is necessary. g. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/of/device.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index dafb973..3b1c8f9 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,25 @@ > 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); > + if (match) > + dev_warn(dev, > + "WARNING: Vendor ID missing from compatible string\n"); > + > + return match; > } > EXPORT_SYMBOL(of_match_device); > > -- > 1.8.3.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/of/device.c b/drivers/of/device.c index dafb973..3b1c8f9 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,25 @@ 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); + if (match) + dev_warn(dev, + "WARNING: Vendor ID missing from compatible string\n"); + + return match; } EXPORT_SYMBOL(of_match_device);
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 rid the kernel of these tables 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 I2C generic i2c_of_match_device(). Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/of/device.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)