From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Date: Fri, 4 Jul 2014 20:24:07 +0000 (+0200)
Subject: mfd: max77686: Make platform data over-rule DT
X-Git-Tag: v4.14-rc1~7072^2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ede04c61642c04e9ff30eebbe56583296d554586;p=platform%2Fkernel%2Flinux-rpi.git

mfd: max77686: Make platform data over-rule DT

The function max77802_i2c_parse_dt_pdata() should only be called
if there isn't already platform data for the device.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index d1f9d04..12d4c17 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 	unsigned int data;
 	int ret = 0;
 
-	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node)
+	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata)
 		pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);
 
 	if (!pdata) {