Commit 3519acb3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'imx-drm-fixes-urgent' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-linus 

imx drm fixes from Russell
parents 86281966 a3fe9641

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-drm-core.c

+6 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, 
		of_node_put(port);

		if (port == imx_crtc->port) {

			ret = of_graph_parse_endpoint(ep, &endpoint);

			return ret ? ret : endpoint.id;

			return ret ? ret : endpoint.port;

		}

	} while (ep);
@@ -675,6 +675,11 @@ static int imx_drm_platform_probe(struct platform_device *pdev) 
			if (!remote || !of_device_is_available(remote)) {

				of_node_put(remote);

				continue;

			} else if (!of_device_is_available(remote->parent)) {

				dev_warn(&pdev->dev, "parent device of %s is not available\n",

					 remote->full_name);

				of_node_put(remote);

				continue;

			}



			ret = imx_drm_add_component(&pdev->dev, remote);

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);