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

Commit f9b9ae14 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 419edc05 on remote branch 

Change-Id: Ibe5662a3a669ceed6b9610dec181aeaad0899dd1
parents 34b20ae0 419edc05

Documentation/devicetree/bindings/fb/mdss-spi-display.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. mdss-spi-display



mdss-spi-display is a spi interface display which support send frame

data and command to panel, compatible with SPI interface specification.



Required properties:

- compatible:		Must be "qcom,mdss-spi-display"

- qcom,mdss-fb-map:	pHandle that specifies the framebuffer to which the

			interface is mapped.



Optional properties:

- label:		A string used to describe the controller used.

Example:

mdss_spi_display: qcom,mdss_spi_display {

	compatible = "qcom,mdss-spi-display";

	label = "mdss spi display";



	mdss_fb0: qcom,mdss_fb_primary {

		cell-index = <0>;

		compatible = "qcom,mdss-fb";

	};

};

arch/arm/configs/msm8937go-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ CONFIG_FB=y 
CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_SPI_PANEL=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

arch/arm/configs/msm8937go_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ CONFIG_FB_VIRTUAL=y 
CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_SPI_PANEL=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

arch/arm/mm/proc-v7.S

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>

#include <asm/memory.h>

#include <asm/cache.h>



#include "proc-macros.S"
@@ -542,10 +543,10 @@ __v7_setup_stack_ptr: 
ENDPROC(__v7_setup)



	.bss

	.align	2

	.align	L1_CACHE_SHIFT

__v7_setup_stack:

	.space	4 * 7				@ 7 registers



	.align	L1_CACHE_SHIFT

	__INITDATA



	.weak cpu_v7_bugs_init

arch/arm64/boot/dts/qcom/qm215-qrd-spi-overlay.dts

0 → 100644
+172 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, 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.

 */



/ {

	model = "QRD SPI";

	qcom,board-id = <0x01000b 5>;

};



&mdss_mdp {

	status = "disabled";

	/delete-node/ qcom,mdss_fb_primary;

};



&mdss_dsi {

	status = "disabled";

};



&mdss_dsi0 {

	status = "disabled";

};



&soc {

	qcom,mdss_wb_panel {

	status = "disabled";

	};

};



&mdss_dsi0_pll {

	status = "disabled";

};



&mdss_dsi1_pll {

	status = "disabled";

};



&mdss_mdp {

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

};



&soc {

	mdss_spi_panel: qcom,mdss_spi_panel {

		compatible = "qcom,mdss-spi-panel";

		label = "mdss spi panel";

		mdss_fb0: qcom,mdss_fb_primary {

			cell-index = <0>;

			compatible = "qcom,mdss-fb";

		};

	};

};



#include "spi-panel-st7789v2-320p-cmd.dtsi"



&soc {

	mdss_spi: qcom,mdss_spi {

		compatible = "qcom,mdss-spi-display";

		label = "mdss spi display";

		qcom,spi-pref-prim-pan = <&spi_st7789v2_320p_cmd>;

		qcom,mdss-spi = <&mdss_spi_panel>;

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

	};



	spi@78b7000 {  /* BLSP1 QUP3 */

		status = "ok";

		qcom,mdss_spi_client {

			reg = <0>;

			compatible = "qcom,mdss-spi-client";

			label = "MDSS SPI QUP3 CLIENT";

			spi-max-frequency = <50000000>;

		};

	};



	i2c@78b7000 {  /* BLSP1 QUP3 */

		status = "disabled";

	};

};



&spi_st7789v2_320p_cmd {

	qcom,mdss-spi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-spi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-spi-bl-pmic-bank-select = <0>;

	qcom,mdss-spi-pwm-gpio = <&pm8916_mpps 4 0>;

	qcom,cont-splash-enabled;

};



&mdss_te_active {

	mux {

		pins = "gpio24";

		function = "gpio";

	};

	config {

		pins = "gpio24";

		drive-strength = <2>; /* 2 mA */

		bias-pull-down; /* pull down*/

	};

};



&mdss_te_suspend {

	mux {

		pins = "gpio24";

		function = "gpio";

	};

	config {

		pins = "gpio24";

		drive-strength = <2>; /* 2 mA */

		bias-pull-down; /* pull down*/

	};

};



&pmx_mdss {

	mdss_spi_panel_active: mdss_spi_panel_active {

		mux {

			pins = "gpio64", "gpio60";

			function = "gpio";

		};

		config {

			pins = "gpio64", "gpio60";

			drive-strength = <8>; /* 8 mA */

			bias-disable = <0>; /* no pull */

			output-high;

		};

	};



	mdss_spi_panel_suspend: mdss_spi_panel_suspend {

		mux {

			pins = "gpio64", "gpio60";

			function = "gpio";

		};

		config {

			pins = "gpio64", "gpio60";

			drive-strength = <2>; /* 2 mA */

			bias-pull-down; /* pull down */

		};

	};

};



&mdss_spi {

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

	pinctrl-0 = <&mdss_te_active &mdss_spi_panel_active>;

	pinctrl-1 = <&mdss_te_suspend &mdss_spi_panel_suspend>;



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

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

	qcom,platform-spi-dc-gpio = <&tlmm 64 0>;



	vddio-supply = <&pm8916_l6>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;

		qcom,panel-supply-entry@0 {

			reg = <1>;

			qcom,supply-name = "vddio";

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

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

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

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

		};

		/delete-node/ qcom,panel-supply-entry@1;

		/delete-node/ qcom,panel-supply-entry@2;

		/delete-node/ qcom,panel-supply-entry@3;

	};

};