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

Commit cbdcb803 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable dynamic clk switch feature for trinket"

parents 679aad43 cd88c863

arch/arm64/boot/dts/qcom/trinket-sde-display.dtsi

+17 −3
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0",

			"src_byte_clk0", "src_pixel_clk0",

			"shadow_byte_clk0", "shadow_pixel_clk0";



		qcom,dsi-panel = <&dsi_td4330_truly_video>;

	};
@@ -141,8 +143,14 @@ 
		qcom,dsi-phy = <&mdss_dsi_phy0>;



		clocks = <&mdss_dsi0_pll BYTE0_MUX_CLK>,

			 <&mdss_dsi0_pll PIX0_MUX_CLK>;

		clock-names = "mux_byte_clk0", "mux_pixel_clk0";

			 <&mdss_dsi0_pll PIX0_MUX_CLK>,

			 <&mdss_dsi0_pll BYTE0_SRC_CLK>,

			 <&mdss_dsi0_pll PIX0_SRC_CLK>,

			 <&mdss_dsi0_pll SHADOW_BYTE0_SRC_CLK>,

			 <&mdss_dsi0_pll SHADOW_PIX0_SRC_CLK>;

		clock-names = "mux_byte_clk0", "mux_pixel_clk0",

			"src_byte_clk0", "src_pixel_clk0",

			"shadow_byte_clk0", "shadow_pixel_clk0";

		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_dsi_active &sde_te_active>;

		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
@@ -183,6 +191,9 @@ 
	qcom,mdss-dsi-panel-status-value = <0x1c>;

	qcom,mdss-dsi-panel-on-check-value = <0x1c>;

	qcom,mdss-dsi-panel-status-read-length = <1>;

	qcom,dsi-dyn-clk-enable;

	qcom,dsi-dyn-clk-list =

		<1048269600 1030798440 1035166232 1039534024 1043901816>;

	qcom,mdss-dsi-display-timings {

		timing@0{

			qcom,mdss-dsi-panel-phy-timings =
@@ -214,6 +225,9 @@ 
	qcom,mdss-dsi-panel-status-value = <0x1c>;

	qcom,mdss-dsi-panel-on-check-value = <0x1c>;

	qcom,mdss-dsi-panel-status-read-length = <1>;

	qcom,dsi-dyn-clk-enable;

	qcom,dsi-dyn-clk-list =

		<1048269600 1030798440 1035166232 1039534024 1043901816>;

	qcom,mdss-dsi-display-timings {

		timing@0{

			qcom,mdss-dsi-panel-phy-timings =

arch/arm64/boot/dts/qcom/trinket-sde-pll.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 
		cell-index = <0>;

		#clock-cells = <1>;

		reg = <0x5e94400 0x588>,

		      <0x5f03000 0x8>;

		reg-names = "pll_base", "gdsc_base";

		      <0x5f03000 0x8>,

		      <0x5e94200 0x100>;

		reg-names = "pll_base", "gdsc_base",

			"dynamic_pll_base";

		clocks = <&clock_dispcc DISP_CC_MDSS_AHB_CLK>;

		clock-names = "iface_clk";

		clock-rate = <0>;

		memory-region = <&dfps_data_memory>;

		gdsc-supply = <&mdss_core_gdsc>;

		qcom,dsi-pll-ssc-en;

		qcom,dsi-pll-ssc-mode = "down-spread";

arch/arm64/boot/dts/qcom/trinket-sde.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -376,8 +376,10 @@ 
		label = "dsi-phy-0";

		cell-index = <0>;

		reg = <0x5e94400 0x588>,

			<0x5e01400 0x100>;

		reg-names = "dsi_phy", "phy_clamp_base";

			<0x5e01400 0x100>,

			<0x5e94200 0x100>;

		reg-names = "dsi_phy", "phy_clamp_base",

			"dyn_refresh_base";

		vdda-0p9-supply = <&VDD_MX_LEVEL>;

		qcom,platform-strength-ctrl = [ff 06

						ff 06

arch/arm64/boot/dts/qcom/trinket.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -553,10 +553,15 @@ 
		};



		cont_splash_memory: cont_splash_region@5c000000 {

			reg = <0x0 0x5c000000 0x0 0x01000000>;

			reg = <0x0 0x5c000000 0x0 0x00f00000>;

			label = "cont_splash_region";

		};



		dfps_data_memory: dfps_data_region@5cf00000 {

			reg = <0x0 0x5cf00000 0x0 0x0100000>;

			label = "dfps_data_region";

		};



		disp_rdump_memory: disp_rdump_region@5c000000 {

			reg = <0x0 0x5c000000 0x0 0x01000000>;

			label = "disp_rdump_region";