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

Commit 434972df 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: enable SPI display for MSM8909W"

parents 2852194b 3ef00969
Loading
Loading
Loading
Loading
+53 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
#include "msm8909w-pm660-mtp.dtsi"
#include "msm8909w-pm660-camera.dtsi"
#include "msm8909w-pm660-camera-sensor-wtp-v1.dtsi"
#include "spi-panel-st7789v2-qvga-cmd.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM8909W-PM660 V1 WTP";
@@ -73,8 +74,15 @@
		/delete-node/ it7260@46;
	};

	spi@78b8000 {  /* BLSP1 QUP4 */
	spi@78B8000 {  /* BLSP1 QUP4 */
		status = "ok";
		qcom,mdss_spi_client {
			reg = <0>;
			compatible = "qcom,mdss-spi-client";
			label = "MDSS SPI QUP4 CLIENT";
			dc-gpio = <&msm_gpio 59 0>;
			spi-max-frequency = <50000000>;
		};
	};

	qcom,msm-ssc-sensors {
@@ -120,6 +128,29 @@

		qcom,subsys-name = "modem";
	};

	mdss_spi: qcom,mdss_spi {
		compatible = "qcom,mdss-spi-display";
		label = "mdss spi panel";

		qcom,mdss-fb-map = <&mdss_fb0>;
		qcom,mdss-mdp = <&mdss_mdp>;
		vdd-supply = <&pm660_l18>;
		vddio-supply = <&pm660_l11>;

		qcom,panel-supply-entries {
			#address-cells = <1>;
			#size-cells = <0>;
			qcom,panel-supply-entry@0 {
				reg = <0>;
				qcom,supply-name = "vdd";
				qcom,supply-min-voltage = <3000000>;
				qcom,supply-max-voltage = <3000000>;
				qcom,supply-enable-load = <100000>;
				qcom,supply-disable-load = <100>;
			};
		};
	};
};

&qcom_seecom {
@@ -252,6 +283,27 @@
	qcom,platform-bklight-en-gpio = <&msm_gpio 37 0>;
};

&spi_st7789v2_qvga_cmd {
	qcom,panel-supply-entries = <&dsi_pm660_panel_pwr_supply>;
	qcom,mdss-spi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-spi-bl-pmic-bank-select = <0>;
	qcom,cont-splash-enabled;
};

&mdss_spi {
	qcom,spi-pref-prim-pan = <&spi_st7789v2_qvga_cmd>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_te_active>;
	pinctrl-1 = <&mdss_te_suspend>;

	qcom,platform-te-gpio = <&msm_gpio 24 0>;
	qcom,platform-reset-gpio = <&msm_gpio 25 0>;
	qcom,platform-spi-dc-gpio = <&msm_gpio 59 0>;

	vdd-supply = <&pm660_l18>;
	vddio-supply = <&pm660_l11>;
};

&dai_mi2s3 {
	qcom,msm-mi2s-rx-lines = <1>;
	qcom,msm-mi2s-tx-lines = <2>;
+67 −0
Original line number Diff line number Diff line
/* Copyright (c) 2018, 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.
 */

&mdss_mdp {
	spi_st7789v2_qvga_cmd: qcom,mdss_spi_st7789v2_qvga_cmd {
		qcom,mdss-spi-panel-name =
			"st7789v2 qvga command mode spi panel";
		qcom,mdss-spi-panel-destination = "display_1";
		qcom,mdss-spi-panel-controller = <&mdss_spi>;
		qcom,mdss-spi-panel-framerate = <27>;
		qcom,mdss-spi-panel-width = <240>;
		qcom,mdss-spi-panel-height = <240>;
		qcom,mdss-spi-h-front-porch = <79>;
		qcom,mdss-spi-h-back-porch = <59>;
		qcom,mdss-spi-h-pulse-width = <60>;
		qcom,mdss-spi-v-back-porch = <10>;
		qcom,mdss-spi-v-front-porch = <7>;
		qcom,mdss-spi-v-pulse-width = <2>;
		qcom,mdss-spi-h-left-border = <0>;
		qcom,mdss-spi-h-right-border = <0>;
		qcom,mdss-spi-v-top-border = <0>;
		qcom,mdss-spi-v-bottom-border = <0>;
		qcom,mdss-spi-bpp = <16>;
		qcom,mdss-spi-on-command = [
				96 01 11
				00 02 36 00
				00 02 3A 05
				00 02 35 00
				00 06 B2 0C 0C 00 33 33
				00 02 B7 75
				00 02 BB 3D
				00 02 C2 01
				00 02 C3 19
				00 02 04 20
				00 02 C6 0F
				00 03 D0 A4 A1
				00 0F E0 70 04 08 09 09 05 2A 33
					41 07 13 13 29 2F
				00 0F E1 70 03 09 0A 09 06 2B 34
					41 07 12 14 28 2E
				00 01 21
				00 01 29
				00 05 2A 00 00 00 EF
				00 05 2B 00 00 00 EF
				00 01 2C];
		qcom,mdss-spi-off-command = [20 01 28
				20 01 10];
		qcom,mdss-spi-bl-min-level = <1>;
		qcom,mdss-spi-bl-max-level = <255>;
		qcom,mdss-spi-bl-pmic-control-type = "bl_gpio_pulse";
		qcom,mdss-spi-reset-sequence = <1 20>, <0 1>, <1 20>;
		qcom,mdss-spi-panel-status-check-mode = "reg_read";
		qcom,mdss-spi-panel-status-reg = /bits/ 8 <0x0a>;
		qcom,mdss-spi-panel-status-read-length = <1>;
		qcom,mdss-spi-panel-max-error-count = <1>;
		qcom,mdss-spi-panel-status-value = /bits/ 8 <0x9c>;
	};
};