aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2013-06-28 08:24:16 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 11:28:49 -0400
commit964c847a4282f08e166bacb5bceb35630361955f (patch)
treefaeef851e97b2750f3260069b0c1343608892ba5
parentfbf970f61eb99014750306038c10b29b3b7bc65b (diff)
ARM i.MX6DL: dts: add clock and mux configuration for LDB
i.MX6DL does not have the second IPU, but the LVDS multiplexers can connect either LVDS channel of the LDB to IPU1 DI0 or IPU1 DI1. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> [shawn.guo: remove "crtcs" property from imx6qdl.dtsi] Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6dl.dtsi17
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi2
2 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 5ec26ac4a2dd..2b5628d23299 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -419,3 +419,20 @@
419 }; 419 };
420 }; 420 };
421}; 421};
422
423&ldb {
424 clocks = <&clks 33>, <&clks 34>,
425 <&clks 39>, <&clks 40>,
426 <&clks 135>, <&clks 136>;
427 clock-names = "di0_pll", "di1_pll",
428 "di0_sel", "di1_sel",
429 "di0", "di1";
430
431 lvds-channel@0 {
432 crtcs = <&ipu1 0>, <&ipu1 1>;
433 };
434
435 lvds-channel@1 {
436 crtcs = <&ipu1 0>, <&ipu1 1>;
437 };
438};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 4033ad4cfe99..799cd1c0b2fd 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -574,13 +574,11 @@
574 574
575 lvds-channel@0 { 575 lvds-channel@0 {
576 reg = <0>; 576 reg = <0>;
577 crtcs = <&ipu1 0>;
578 status = "disabled"; 577 status = "disabled";
579 }; 578 };
580 579
581 lvds-channel@1 { 580 lvds-channel@1 {
582 reg = <1>; 581 reg = <1>;
583 crtcs = <&ipu1 1>;
584 status = "disabled"; 582 status = "disabled";
585 }; 583 };
586 }; 584 };