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

Commit 61a16a5e 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: fix mdss & dsi dt settings for msm8937"

parents de7eb617 d50af27f

arch/arm/boot/dts/qcom/msm8937-mdss-pll.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
	};



	mdss_dsi1_pll: qcom,mdss_dsi_pll@1a96a00 {

		status = "disabled";

		compatible = "qcom,mdss_dsi_pll_8937";

		label = "MDSS DSI 1 PLL";

		cell-index = <1>;

arch/arm/boot/dts/qcom/msm8937-mdss.dtsi

+10 −12
Original line number Diff line number Diff line
@@ -99,20 +99,10 @@ 
				    <0x012b4 0x00000444>,

				    <0x012bc 0x40444444>,

				    <0x012c4 0x00000044>,

				    <0x013a8 0x44040044>,

				    <0x013b0 0x04444044>,

				    <0x013b8 0x44444040>,

				    <0x013d0 0x00444000>,

				    <0x0506c 0x00000000>,

				    <0x0706c 0x00000000>,

				    <0x0906c 0x00000000>,

				    <0x0b06c 0x00000000>,

				    <0x1506c 0x00000000>,

				    <0x1706c 0x00000000>,

				    <0x1906c 0x00000000>,

				    <0x1b06c 0x00000000>,

				    <0x2506c 0x00000000>,

				    <0x2706c 0x00000000>;

				    <0x2506c 0x00000000>;



		qcom,regs-dump-mdp = <0x01000 0x01454>,

				     <0x02000 0x02064>,
@@ -197,6 +187,15 @@ 
		gdsc-supply = <&gdsc_mdss>;

		vdda-supply = <&pm8937_l2>;

		vddio-supply = <&pm8937_l6>;



		/* Bus Scale Settings */

		qcom,msm-bus,name = "mdss_dsi";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

			<22 512 0 0>,

			<22 512 0 1000>;



		ranges = <0x1a94000 0x1a94000 0x300

			0x1a94400 0x1a94400 0x280

			0x1a94b80 0x1a94b80 0x30
@@ -348,7 +347,6 @@ 
		compatible = "qcom,mdss_rotator";

		qcom,mdss-wb-count = <1>;

		qcom,mdss-has-downscale;

		qcom,mdss-has-reg-bus;

		qcom,mdss-has-ubwc;

		/* Bus Scale Settings */

		qcom,msm-bus,name = "mdss_rotator";

arch/arm/boot/dts/qcom/msm8937.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -564,10 +564,10 @@ 


	clock_gcc_mdss: qcom,gcc-mdss@1800000 {

		compatible = "qcom,gcc-mdss-8937";

		clocks = <&mdss_dsi0_pll clk_dsi_pll0_pixel_clk_src>,

			 <&mdss_dsi0_pll clk_dsi_pll0_byte_clk_src>,

			 <&mdss_dsi1_pll clk_dsi_pll1_pixel_clk_src>,

			 <&mdss_dsi1_pll clk_dsi_pll1_byte_clk_src>;

		clocks = <&mdss_dsi0_pll clk_pixel_clk_src>,

			 <&mdss_dsi0_pll clk_byte_clk_src>,

			 <&mdss_dsi0_pll clk_pixel_clk_src>,

			 <&mdss_dsi0_pll clk_byte_clk_src>;

		clock-names = "pixel_src", "byte_src", "pclk1_src",

				"byte1_src";

		#clock-cells = <1>;