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

Commit d74f6799 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 65d7eca2 15f6afcf

arch/arm/boot/dts/apq8084.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,11 @@ 
		qcom,ocmem-size = <524288>; /* 512 * 1024*/

		qcom,max-hw-load = <1281600>; /* Full 4k @ 30 + 1080p @ 30 */

		qcom,vidc-ns-map = <0x40000000 0x40000000>;

		venus-supply = <&gdsc_venus>;

		venus-core0-supply = <&gdsc_venus_core0>;

		venus-core1-supply = <&gdsc_venus_core1>;

		qcom,clock-names= "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk", "mem_clk";

		qcom,clock-configs = <0x3 0x0 0x0 0x0 0x0 0x0>;

		qcom,load-freq-tbl = <979200 465000000>,

			<783360 465000000>,

			<489600 266670000>,

arch/arm/boot/dts/msm8226.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -169,7 +169,9 @@ 
		compatible = "qcom,msm-vidc";

		reg = <0xfdc00000 0xff000>;

		interrupts = <0 44 0>;

		vdd-supply = <&gdsc_venus>;

		venus-supply = <&gdsc_venus>;

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x3 0x0 0x0>;

		qcom,load-freq-tbl = <352800 160000000>,

			<244800 133330000>,

			<108000  66700000>;

arch/arm/boot/dts/msm8974.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -220,10 +220,12 @@ 
		compatible = "qcom,msm-vidc";

		reg = <0xfdc00000 0xff000>;

		interrupts = <0 44 0>;

		vdd-supply = <&gdsc_venus>;

		venus-supply = <&gdsc_venus>;

		qcom,hfi = "venus";

		qcom,ocmem-size = <524288>; /* 512 * 1024*/

		qcom,max-hw-load = <1224450>; /* 4k @ 30 + 1080p @ 30*/

		qcom,clock-names = "core_clk", "iface_clk", "bus_clk", "mem_clk";

		qcom,clock-configs = <0x3 0x0 0x0 0x0>;

	};



	qcom,vidc {