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

Commit 36499582 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: Remove DMA muxer resetting on msm8937, msm8953 and msm8996"

parents 3027918f b98e813d
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@
		clock-names = "iface_clk", "bus_clk", "core_clk_src",
				"core_clk", "vsync_clk";

		qcom,mdp-settings = <0x01190 0x00000000>,
				    <0x0506c 0x00000000>,
		qcom,mdp-settings = <0x0506c 0x00000000>,
				    <0x1506c 0x00000000>,
				    <0x1706c 0x00000000>,
				    <0x2506c 0x00000000>;
+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@
		clock-names = "iface_clk", "bus_clk", "core_clk_src",
				"core_clk", "vsync_clk";

		qcom,mdp-settings = <0x01190 0x00000000>,
				    <0x0506c 0x00000000>,
		qcom,mdp-settings = <0x0506c 0x00000000>,
				    <0x1506c 0x00000000>,
				    <0x1706c 0x00000000>,
				    <0x2506c 0x00000000>;
+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@
		clock-names = "iface_clk", "bus_clk", "core_clk_src",
				"core_clk", "vsync_clk";

		qcom,mdp-settings = <0x01190 0x00000000>,
				    <0x012ac 0xc0000ccc>,
		qcom,mdp-settings = <0x012ac 0xc0000ccc>,
				    <0x012b4 0xc0000ccc>,
				    <0x012bc 0x00cccccc>,
				    <0x012c4 0x000000cc>,