[PATCH 2/2] ARM i.MX6DL: dts: add clock and mux configuration for LDB
From: Shawn Guo <hidden>
Date: 2013-07-01 08:52:57
On Fri, Jun 28, 2013 at 02:24:16PM +0200, Philipp Zabel wrote:
quoted hunk ↗ jump to hunk
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> --- arch/arm/boot/dts/imx6dl.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 80155fde..5ec89eb 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi@@ -417,3 +417,20 @@ }; }; }; + +&ldb { + clocks = <&clks 33>, <&clks 34>, + <&clks 39>, <&clks 40>, + <&clks 135>, <&clks 136>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", + "di0", "di1"; + + lvds-channel at 0 { + crtcs = <&ipu1 0>, <&ipu1 1>; + }; + + lvds-channel at 1 { + crtcs = <&ipu1 0>, <&ipu1 1>; + };
So now we have both imx6q.dtsi and imx6dl.dtsi overwrite the "crtcs" defined in imx6qdl.dtsi. Should we remove it from imx6qdl.dtsi, or define a sane one in imx6qdl.dtsi to save one overwrite? Shawn
+}; -- 1.8.3.1