From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Wed, 5 Mar 2014 09:20:57 +0000 (+0100)
Subject: imx-drm: imx-tve: Fix DDC I2C bus property
X-Git-Tag: v3.15-rc1~139^2~586^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62e3879a2c6c1320b46bf15647b3cf5cf8271b04;p=~emulex%2Finfiniband.git

imx-drm: imx-tve: Fix DDC I2C bus property

This patch fixes the TV Encoder DDC I2C bus property to use the common
'ddc-i2c-bus' property name instead of 'ddc'.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 702c0c3204e..7002ae0a08c 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -581,7 +581,7 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
 	tve->dev = dev;
 	spin_lock_init(&tve->lock);
 
-	ddc_node = of_parse_phandle(np, "ddc", 0);
+	ddc_node = of_parse_phandle(np, "i2c-ddc-bus", 0);
 	if (ddc_node) {
 		tve->ddc = of_find_i2c_adapter_by_node(ddc_node);
 		of_node_put(ddc_node);