From: Robby Cai Date: Tue, 11 Mar 2014 10:41:45 +0000 (+0800) Subject: ENGR00302869-1 ARM: dts: imx6qdl: add cfg_clk for MIPI CSI2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d728eb76f217753d4f6e942b9f0fe2af8646ef7;p=karo-tx-linux.git ENGR00302869-1 ARM: dts: imx6qdl: add cfg_clk for MIPI CSI2 MIPI CSI2 depends on this clock to work. This patch also updates the binding document. Signed-off-by: Robby Cai (cherry picked from commit 67e7963f6f7ddb6c001bb34c6af71f2330fd0e3f) --- diff --git a/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt b/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt index 4b502809fc2d..d10f23721f34 100644 --- a/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt +++ b/Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt @@ -27,8 +27,8 @@ for SOC imx6qdl.dtsi: compatible = "fsl,imx6q-mipi-csi2"; reg = <0x021dc000 0x4000>; interrupts = <0 100 0x04>, <0 101 0x04>; - clocks = <&clks 138>, <&clks 53>; - clock-names = "dphy_clk", "pixel_clk"; + clocks = <&clks 138>, <&clks 53>, <&clks 204>; + clock-names = "dphy_clk", "pixel_clk", "cfg_clk"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index ea8ec2a501d0..56758f327e90 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -962,13 +962,13 @@ compatible = "fsl,imx6q-mipi-csi2"; reg = <0x021dc000 0x4000>; interrupts = <0 100 0x04>, <0 101 0x04>; - clocks = <&clks 138>, <&clks 53>; + clocks = <&clks 138>, <&clks 53>, <&clks 204>; /* Note: clks 138 is hsi_tx, however, the dphy_c * hsi_tx and pll_refclk use the same clk gate. * In current clk driver, open/close clk gate do * use hsi_tx for a temporary debug purpose. */ - clock-names = "dphy_clk", "pixel_clk"; + clock-names = "dphy_clk", "pixel_clk", "cfg_clk"; status = "disabled"; };