i2c: nomadik: switch from of_device_is_compatible() to of_match_device()

Compatible-specific behavior is implemented using a if-condition on the
return value from of_device_is_compatible(), from probe. It does not
scale well when compatible number increases. Switch to using a match
table and a call to of_match_device().

We DO NOT attach a .of_match_table field to our amba driver, as we do
not use the table to match our driver to devices.

Sort probe variable declarations in reverse christmas tree to try and
introduce some logic into the ordering.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index ad0f02acdb1215a1c04729f97bb14a4d93f88456..c40328d1bca6cdefc61906cf9160f8411e37922a 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -26,6 +26,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
@@ -1046,8 +1047,6 @@ static int nmk_i2c_eyeq5_probe(struct nmk_i2c_dev *priv)
        struct regmap *olb;
        unsigned int id;
 
-       priv->has_32b_bus = true;
-
        olb = syscon_regmap_lookup_by_phandle_args(np, "mobileye,olb", 1, &id);
        if (IS_ERR(olb))
                return PTR_ERR(olb);
@@ -1068,15 +1067,35 @@ static int nmk_i2c_eyeq5_probe(struct nmk_i2c_dev *priv)
        return 0;
 }
 
+#define NMK_I2C_EYEQ_FLAG_32B_BUS      BIT(0)
+#define NMK_I2C_EYEQ_FLAG_IS_EYEQ5     BIT(1)
+
+static const struct of_device_id nmk_i2c_eyeq_match_table[] = {
+       {
+               .compatible = "mobileye,eyeq5-i2c",
+               .data = (void *)(NMK_I2C_EYEQ_FLAG_32B_BUS | NMK_I2C_EYEQ_FLAG_IS_EYEQ5),
+       },
+};
+
 static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 {
-       int ret = 0;
-       struct nmk_i2c_dev *priv;
+       struct i2c_vendor_data *vendor = id->data;
+       u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
        struct device_node *np = adev->dev.of_node;
+       const struct of_device_id *match;
        struct device *dev = &adev->dev;
+       unsigned long match_flags = 0;
+       struct nmk_i2c_dev *priv;
        struct i2c_adapter *adap;
-       struct i2c_vendor_data *vendor = id->data;
-       u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
+       int ret = 0;
+
+       /*
+        * We do not want to attach a .of_match_table to our amba driver.
+        * Do not convert to device_get_match_data().
+        */
+       match = of_match_device(nmk_i2c_eyeq_match_table, dev);
+       if (match)
+               match_flags = (unsigned long)match->data;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -1084,10 +1103,10 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 
        priv->vendor = vendor;
        priv->adev = adev;
-       priv->has_32b_bus = false;
+       priv->has_32b_bus = match_flags & NMK_I2C_EYEQ_FLAG_32B_BUS;
        nmk_i2c_of_probe(np, priv);
 
-       if (of_device_is_compatible(np, "mobileye,eyeq5-i2c")) {
+       if (match_flags & NMK_I2C_EYEQ_FLAG_IS_EYEQ5) {
                ret = nmk_i2c_eyeq5_probe(priv);
                if (ret)
                        return dev_err_probe(dev, ret, "failed OLB lookup\n");