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

Commit 260eba89 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: Specify clocks and regulators for venus"

parents 6154d7dc c6ac7bd8
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ Optional properties:
- qcom,clock-names: an array of clocks that the driver is supposed to be
  manipulating. The clocks names here correspond to the clock names used in
  clk_get(<name>).
- clock-names: an array of clocks that the driver is supposed to be
  manipulating. The clocks names here correspond to the clock names used in
  clk_get(<name>).
- qcom,clock-configs = an array of bitmaps of clocks' configurations. The index
  of the bitmap corresponds to the clock at the same index in qcom,clock-names.
  The bitmaps describes the actions that the device needs to take regarding the
@@ -118,6 +121,7 @@ Example:
			<0x80178 0x00001FFF>;
		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/
		qcom,clock-names = "foo_clk", "bar_clk", "baz_clk";
		clock-names = "foo_clk", "bar_clk", "baz_clk";
		qcom,clock-properties = <0x3 0x1 0x0>;
		qcom,buffer-type-tz-usage-table = <0x1 0x1>,
						<0x1fe 0x2>;
+14 −2
Original line number Diff line number Diff line
@@ -998,9 +998,21 @@
			<0xe0024 0x5555556>,
			<0x80124 0x3>;
		qcom,max-hw-load = <1281600>; /* Full 4k @ 30 + 1080p @ 30 */
		qcom,clock-names = "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk",
			"mem_clk";
		qcom,clock-names = "core_clk", "core0_clk", "core1_clk", "core2_clk",
			"iface_clk", "bus_clk";
		clock-names = "core_clk", "core0_clk", "core1_clk", "core2_clk",
			"iface_clk", "bus_clk";
		venus-supply = <&gdsc_venus>;
		venus-core0-supply = <&gdsc_venus_core0>;
		venus-core1-supply = <&gdsc_venus_core1>;
		venus-core2-supply = <&gdsc_venus_core2>;
		qcom,clock-configs = <0x3 0x0 0x0 0x0 0x0 0x0>;
		clocks = <&clock_mmss clk_venus0_vcodec0_clk>,
			<&clock_mmss clk_venus0_core0_vcodec_clk>,
			<&clock_mmss clk_venus0_core1_vcodec_clk>,
			<&clock_mmss clk_venus0_core2_vcodec_clk>,
			<&clock_mmss clk_venus0_ahb_clk>,
			<&clock_mmss clk_venus0_axi_clk>;
		qcom,load-freq-tbl = <979200 465000000>,
			<783360 465000000>,
			<489600 266670000>,