Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5a19e17 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Set correct clock rates for face detection"

parents 9cd3c054 cc6efb14

Documentation/devicetree/bindings/media/video/msm-fd.txt

+3 −3
Original line number Diff line number Diff line
@@ -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>;

    };

arch/arm/boot/dts/qcom/msm8994-camera.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -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 {