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

Commit a501834c 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 mdss throttle clock for SDM660 and SDM630"

parents 01ecd15b e0fa41a4
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -112,13 +112,14 @@
		clocks = <&clock_mmss MMSS_MNOC_AHB_CLK>,
		clocks = <&clock_mmss MMSS_MNOC_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AXI_CLK>,
			 <&clock_mmss MMSS_MDSS_AXI_CLK>,
			 <&clock_mmss MMSS_THROTTLE_MDSS_AXI_CLK>,
			 <&clock_mmss MDP_CLK_SRC>,
			 <&clock_mmss MDP_CLK_SRC>,
			 <&clock_mmss MMSS_MDSS_MDP_CLK>,
			 <&clock_mmss MMSS_MDSS_MDP_CLK>,
			 <&clock_mmss MMSS_MDSS_VSYNC_CLK>,
			 <&clock_mmss MMSS_MDSS_VSYNC_CLK>,
			 <&clock_mmss MDP_CLK_SRC>;
			 <&clock_mmss MDP_CLK_SRC>;
		clock-names = "mnoc_clk", "iface_clk", "bus_clk",
		clock-names = "mnoc_clk", "iface_clk", "bus_clk",
				"core_clk_src", "core_clk", "vsync_clk",
				"throttle_bus_clk", "core_clk_src",
				"lut_clk";
				"core_clk", "vsync_clk", "lut_clk";


		qcom,mdp-settings = <0x01190 0x00000000>,
		qcom,mdp-settings = <0x01190 0x00000000>,
				    <0x012ac 0xc0000ccc>,
				    <0x012ac 0xc0000ccc>,
+3 −2
Original line number Original line Diff line number Diff line
@@ -117,13 +117,14 @@
		clocks = <&clock_mmss MMSS_MNOC_AHB_CLK>,
		clocks = <&clock_mmss MMSS_MNOC_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AHB_CLK>,
			 <&clock_mmss MMSS_MDSS_AXI_CLK>,
			 <&clock_mmss MMSS_MDSS_AXI_CLK>,
			 <&clock_mmss MMSS_THROTTLE_MDSS_AXI_CLK>,
			 <&clock_mmss MDP_CLK_SRC>,
			 <&clock_mmss MDP_CLK_SRC>,
			 <&clock_mmss MMSS_MDSS_MDP_CLK>,
			 <&clock_mmss MMSS_MDSS_MDP_CLK>,
			 <&clock_mmss MMSS_MDSS_VSYNC_CLK>,
			 <&clock_mmss MMSS_MDSS_VSYNC_CLK>,
			 <&clock_mmss MDP_CLK_SRC>;
			 <&clock_mmss MDP_CLK_SRC>;
		clock-names = "mnoc_clk", "iface_clk", "bus_clk",
		clock-names = "mnoc_clk", "iface_clk", "bus_clk",
				"core_clk_src", "core_clk", "vsync_clk",
				"throttle_bus_clk", "core_clk_src",
				"lut_clk";
				"core_clk", "vsync_clk", "lut_clk";


		qcom,mdp-settings = <0x01190 0x00000000>,
		qcom,mdp-settings = <0x01190 0x00000000>,
				    <0x012ac 0xc0000ccc>,
				    <0x012ac 0xc0000ccc>,