mfd: mc13xxx: Change probing details for mc13xxx devices

This removes auto-detection of which variant of mc13xxx is used because
mc34708 uses a different layout in the revision register that doesn't
allow differentiation any more.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Reilly <marc@cpdesign.com.au>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 9d18dde3cd2a..4a0afc7f2d4e 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -24,7 +24,7 @@
 static const struct i2c_device_id mc13xxx_i2c_device_id[] = {
         {
                 .name = "mc13892",
-                .driver_data = MC13XXX_ID_MC13892,
+                .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892,
         }, {
                 /* sentinel */
         }
@@ -34,7 +34,7 @@ MODULE_DEVICE_TABLE(i2c, mc13xxx_i2c_device_id);
 static const struct of_device_id mc13xxx_dt_ids[] = {
         {
                 .compatible = "fsl,mc13892",
-                .data = (void *) &mc13xxx_i2c_device_id[0],
+                .data = &mc13xxx_variant_mc13892,
         }, {
                 /* sentinel */
         }
@@ -76,11 +76,15 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
                 return ret;
         }
 
-        ret = mc13xxx_common_init(mc13xxx, pdata, client->irq);
+        if (client->dev.of_node) {
+                const struct of_device_id *of_id =
+                        of_match_device(mc13xxx_dt_ids, &client->dev);
+                mc13xxx->variant = of_id->data;
+        } else {
+                mc13xxx->variant = (void *)id->driver_data;
+        }
 
-        if (ret == 0 && (id->driver_data != mc13xxx->ictype))
-                dev_warn(mc13xxx->dev,
-                                "device id doesn't match auto detection!\n");
+        ret = mc13xxx_common_init(mc13xxx, pdata, client->irq);
 
         return ret;
 }