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

Commit 86b60d62 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 vcodec0 and vcodec1 axi clocks on sdm845" into msm-4.9

parents 6fb18293 bd96a43a

arch/arm64/boot/dts/qcom/sdm845-vidc.dtsi

+8 −4
Original line number Original line Diff line number Diff line
@@ -34,15 +34,19 @@ 




		/* Clocks */

		/* Clocks */

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

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

			"core0_clk", "core1_clk";

			"core0_clk", "core0_bus_clk",

			"core1_clk", "core1_bus_clk";

		clocks = <&clock_videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,

		clocks = <&clock_videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,

			<&clock_videocc VIDEO_CC_VENUS_AHB_CLK>,

			<&clock_videocc VIDEO_CC_VENUS_AHB_CLK>,

			<&clock_videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,

			<&clock_videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,

			<&clock_videocc VIDEO_CC_VCODEC0_CORE_CLK>,

			<&clock_videocc VIDEO_CC_VCODEC0_CORE_CLK>,

			<&clock_videocc VIDEO_CC_VCODEC1_CORE_CLK>;

			<&clock_videocc VIDEO_CC_VCODEC0_AXI_CLK>,

			<&clock_videocc VIDEO_CC_VCODEC1_CORE_CLK>,

			<&clock_videocc VIDEO_CC_VCODEC1_AXI_CLK>;

		qcom,proxy-clock-names = "core_clk", "iface_clk",

		qcom,proxy-clock-names = "core_clk", "iface_clk",

			"bus_clk", "core0_clk", "core1_clk";

			"bus_clk", "core0_clk", "core0_bus_clk",

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

			"core1_clk", "core1_bus_clk";

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

		qcom,allowed-clock-rates = <200000000 320000000 380000000

		qcom,allowed-clock-rates = <200000000 320000000 380000000

			444000000 533000000>;

			444000000 533000000>;

		qcom,clock-freq-tbl {

		qcom,clock-freq-tbl {