diff options
| author | Robby Cai <R63905@freescale.com> | 2014-03-11 18:41:45 +0800 |
|---|---|---|
| committer | Robby Cai <R63905@freescale.com> | 2014-03-14 16:20:00 +0800 |
| commit | 5d728eb76f217753d4f6e942b9f0fe2af8646ef7 (patch) | |
| tree | 5ab68cd6e679e4c94c666e46cbb7f006493406b6 | |
| parent | e489d6afe180688fbaf83dbb44c37bdec42bb8e0 (diff) | |
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 <R63905@freescale.com>
(cherry picked from commit 67e7963f6f7ddb6c001bb34c6af71f2330fd0e3f)
| -rw-r--r-- | Documentation/devicetree/bindings/video/fsl,mipi-csi2.txt | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 4 |
2 files changed, 4 insertions, 4 deletions
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"; }; |