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

Commit 675c35bd 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: Add camss_ahb_clk to CPP section for msm8994"

parents fcc741ac 89be97a7

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

+7 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
- clocks: list of phandles to the clock controller device and coresponding

  clock names.

- clock-names: name of the clocks required for the device used by the consumer.

- clock-rates: clock rate in Hz.

- qcom,clock-rates: clock rate in Hz.



Example:
@@ -30,15 +30,16 @@ Example: 
		reg-names = "cpp", "cpp_vbif", "cpp_hw";

		interrupts = <0 49 0>;

		interrupt-names = "cpp";

		vdd-supply = <&gdsc_vfe>;

		vdd-supply = <&gdsc_cpp>;

		clocks = <&clock_mmss clk_camss_top_ahb_clk>,

			<&clock_mmss clk_cpp_clk_src>,

			<&clock_mmss clk_camss_vfe_cpp_ahb_clk>,

			<&clock_mmss clk_camss_vfe_cpp_axi_clk>,

			<&clock_mmss clk_camss_vfe_cpp_clk>,

			<&clock_mmss clk_camss_micro_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cpp_clk_src",

			<&clock_mmss clk_camss_micro_ahb_clk>,

			<&clock_mmss clk_camss_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cpp_core_clk",

			"camss_vfe_cpp_ahb_clk", "camss_vfe_cpp_axi_clk",

			"camss_vfe_cpp_clk","camss_micro_ahb_clk";

		clock-rates = <0 266670000 0 0 266670000 0>;

			"camss_vfe_cpp_clk","micro_iface_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 465000000 0 0 465000000 0 0>;

	};

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

+6 −5
Original line number Diff line number Diff line
@@ -373,17 +373,18 @@ 
		reg-names = "cpp", "cpp_vbif", "cpp_hw";

		interrupts = <0 49 0>;

		interrupt-names = "cpp";

		vdd-supply = <&gdsc_vfe>;

		vdd-supply = <&gdsc_cpp>;

		clocks = <&clock_mmss clk_camss_top_ahb_clk>,

			<&clock_mmss clk_cpp_clk_src>,

			<&clock_mmss clk_camss_vfe_cpp_ahb_clk>,

			<&clock_mmss clk_camss_vfe_cpp_axi_clk>,

			<&clock_mmss clk_camss_vfe_cpp_clk>,

			<&clock_mmss clk_camss_micro_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cpp_clk_src",

			<&clock_mmss clk_camss_micro_ahb_clk>,

			<&clock_mmss clk_camss_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cpp_core_clk",

			"camss_vfe_cpp_ahb_clk", "camss_vfe_cpp_axi_clk",

			"camss_vfe_cpp_clk","camss_micro_ahb_clk";

		clock-rates = <0 266670000 0 0 266670000 0>;

			"camss_vfe_cpp_clk","micro_iface_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 465000000 0 0 465000000 0 0>;

	};



	qcom,fd@fd878000 {