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

Commit 0940a5a0 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 display specific nodes for msm8937"

parents 8284f82f 14025bd5

Documentation/devicetree/bindings/fb/mdss-mdp.txt

+15 −0
Original line number Diff line number Diff line
@@ -594,6 +594,14 @@ Subnode properties: 
			needed by the device.

- clock-names:		List of clock names needed by the device.



Subnode properties:

Required properties:

- compatible:		Must be "qcom,mdss_wb"

- qcom,mdss_pan_res:	Array containing two elements, width and height which

			specifies size of writeback buffer.

- qcom,mdss_pan_bpp:	Specifies bits per pixel for writeback buffer.

- qcom,mdss-fb-map:	Specifies the handle for frame buffer.



Example:

	mdss_mdp: qcom,mdss_mdp@fd900000 {

		compatible = "qcom,mdss_mdp";
@@ -771,5 +779,12 @@ Example: 
				<&clock_mmss clk_smmu_mdp_axi_clk>;

			clock-names = "dummy_clk", "dummy_clk";

		};



		qcom,mdss_wb_panel {

			compatible = "qcom,mdss_wb";

			qcom,mdss_pan_res = <1280 720>;

			qcom,mdss_pan_bpp = <24>;

			qcom,mdss-fb-map = <&mdss_fb1>;

		};

	};

Documentation/devicetree/bindings/fb/mdss-pll.txt

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ Required properties: 
			"qcom,mdss_dsi_pll_8992", "qcom,mdss_hdmi_pll_8992",

			"qcom,mdss_dsi_pll_8996", "qcom,mdss_hdmi_pll_8996",

			"qcom,mdss_hdmi_pll_8996_v2", "qcom,mdss_dsi_pll_8996_v2",

			"qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_dsi_pll_8952"

			"qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_dsi_pll_8952",

			"qcom,mdss_dsi_pll_8937"

- cell-index:		Specifies the controller used

- reg:			offset and length of the register set for the device.

- reg-names :		names to refer to register sets related to this device

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

+43 −0
Original line number Diff line number Diff line
@@ -200,3 +200,46 @@ 
		pinctrl-2 = <&ts_release>;

	};

};



#include "msm8937-mdss-panels.dtsi"



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_truly_1080_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-enable-gpio = <&tlmm 99 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 98 0>;

};



&mdss_dsi1 {

	status = "disabled";

	qcom,dsi-pref-prim-pan = <&dsi_truly_1080_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-enable-gpio = <&tlmm 99 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 98 0>;

};



&dsi_truly_1080_vid {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};



&dsi_truly_1080_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "dsi-panel-sim-video.dtsi"

#include "dsi-panel-sim-cmd.dtsi"

#include "dsi-panel-truly-1080p-video.dtsi"

#include "dsi-panel-truly-1080p-cmd.dtsi"



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdd";

			qcom,supply-min-voltage = <2850000>;

			qcom,supply-max-voltage = <2850000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};



		qcom,panel-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};



	};

};

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

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	mdss_dsi0_pll: qcom,mdss_dsi_pll@1a94a00 {

		compatible = "qcom,mdss_dsi_pll_8937";

		label = "MDSS DSI 0 PLL";

		cell-index = <0>;

		#clock-cells = <1>;



		reg = <0x001a94a00 0xd4>,

			<0x0184d074 0x8>;

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



		gdsc-supply = <&gdsc_mdss>;

		vddio-supply = <&pm8937_l6>;



		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>;

		clock-names = "iface_clk";

		clock-rate = <0>;



		qcom,platform-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "gdsc";

				qcom,supply-min-voltage = <0>;

				qcom,supply-max-voltage = <0>;

				qcom,supply-enable-load = <0>;

				qcom,supply-disable-load = <0>;

			};



			qcom,platform-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			};

		};

	};



	mdss_dsi1_pll: qcom,mdss_dsi_pll@1a96a00 {

		compatible = "qcom,mdss_dsi_pll_8937";

		label = "MDSS DSI 1 PLL";

		cell-index = <1>;

		#clock-cells = <1>;



		reg = <0x001a96a00 0xd4>,

			<0x0184d074 0x8>;

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



		gdsc-supply = <&gdsc_mdss>;

		vddio-supply = <&pm8937_l6>;



		clocks = <&clock_gcc clk_gcc_mdss_ahb_clk>;

		clock-names = "iface_clk";

		clock-rate = <0>;



		qcom,platform-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "gdsc";

				qcom,supply-min-voltage = <0>;

				qcom,supply-max-voltage = <0>;

				qcom,supply-enable-load = <0>;

				qcom,supply-disable-load = <0>;

			};



			qcom,platform-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			};

		};

	};

};