Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3fe9641 authored by Shawn Guo's avatar Shawn Guo Committed by Russell King
Browse files

imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus' 



Commit 62e3879a (imx-drm: imx-tve: Fix DDC I2C bus property) was trying
to use 'ddc-i2c-bus' as the DDC property name (we can see that from the
commit log), but unfortunately 'i2c-ddc-bus' which is a typo was
actually used in the code.  This results in some unnecessary
inconsistency and confusions, because all the documented DDC property
in device tree bindings use 'ddc-i2c-bus'.

  Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt
  Documentation/devicetree/bindings/panel/simple-panel.txt
  Documentation/devicetree/bindings/video/dvi-connector.txt

Let's fix it before the error spreads.

Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1c236629

arch/arm/boot/dts/imx53-mba53.dts

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ 
&tve {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_vga_sync_1>;

	i2c-ddc-bus = <&i2c3>;

	ddc-i2c-bus = <&i2c3>;

	fsl,tve-mode = "vga";

	fsl,hsync-pin = <4>;

	fsl,vsync-pin = <6>;

drivers/staging/imx-drm/imx-tve.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,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, "i2c-ddc-bus", 0);

	ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);

	if (ddc_node) {

		tve->ddc = of_find_i2c_adapter_by_node(ddc_node);

		of_node_put(ddc_node);