diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-09 02:54:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-09 02:54:10 -0700 |
| commit | d5a19e17f75e687285b115c54ff6bdd4f68b7227 (patch) | |
| tree | 00b5045a84163613518f79a198095be1b95aad45 | |
| parent | 9cd3c05455cfefbd1eb820e382282728d142fdbf (diff) | |
| parent | cc6efb14e5bb93fb55cd2c30041083f98bc6c521 (diff) | |
Merge "ARM: dts: msm: Set correct clock rates for face detection"
| -rw-r--r-- | Documentation/devicetree/bindings/media/video/msm-fd.txt | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8994-camera.dtsi | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/media/video/msm-fd.txt b/Documentation/devicetree/bindings/media/video/msm-fd.txt index 30d01fbcd31..1633552abfc 100644 --- a/Documentation/devicetree/bindings/media/video/msm-fd.txt +++ b/Documentation/devicetree/bindings/media/video/msm-fd.txt @@ -43,10 +43,10 @@ Example: interrupt-names = "fd"; vdd-supply = <&gdsc_fd>; clocks = <&clock_mmss clk_fd_core_clk>, - <&clock_mmss clk_fd_ahb_clk>, + <&clock_mmss clk_fd_core_uar_clk>, <&clock_mmss clk_fd_axi_clk>, - <&clock_mmss clk_fd_core_uar_clk>; + <&clock_mmss clk_fd_ahb_clk>; clock-names = "fd_core_clk", "fd_core_uar_clk", "fd_axi_clk", "fd_ahb_clk"; - clock-rates = <400 400 334 80 240>; + clock-rates = <400000000 400000000 333000000 80000000>; }; diff --git a/arch/arm/boot/dts/qcom/msm8994-camera.dtsi b/arch/arm/boot/dts/qcom/msm8994-camera.dtsi index 2265dffd53a..b1443d2771d 100644 --- a/arch/arm/boot/dts/qcom/msm8994-camera.dtsi +++ b/arch/arm/boot/dts/qcom/msm8994-camera.dtsi @@ -346,7 +346,6 @@ qcom,fd@fd878000 { cell-index = <0>; - status = "disabled"; compatible = "qcom,face-detection"; reg = <0xfd878000 0x800>, <0xfd87c000 0x800>, @@ -356,12 +355,12 @@ interrupt-names = "fd"; vdd-supply = <&gdsc_fd>; clocks = <&clock_mmss clk_fd_core_clk>, - <&clock_mmss clk_fd_ahb_clk>, + <&clock_mmss clk_fd_core_uar_clk>, <&clock_mmss clk_fd_axi_clk>, - <&clock_mmss clk_fd_core_uar_clk>; + <&clock_mmss clk_fd_ahb_clk>; clock-names = "fd_core_clk", "fd_core_uar_clk", "fd_axi_clk", "fd_ahb_clk"; - clock-rates = <400 400 334 80 240>; + clock-rates = <400000000 400000000 333000000 800000000>; }; cci: qcom,cci@fda0c000 { |