Merge "arm: dts: msm: enable Synaptics touch on marmot" (f104d9db) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/arm64/boot/dts/qcom/sm8150-marmot-mtp-overlay.dts

+42 −0

Original line number	Diff line number	Diff line
		@@ -26,3 +26,45 @@
		qcom,board-id = <0x05010008 0x5>;
		};

		&dsi_rm69299_visionox_amoled_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <255>;
		qcom,panel-mode-gpio = <&tlmm 7 0>;
		qcom,mdss-dsi-mode-sel-gpio-state = "single_port";
		qcom,platform-te-gpio = <&tlmm 8 0>;
		qcom,platform-reset-gpio = <&tlmm 9 0>;
		};

		&dsi_rm69299_visionox_amoled_vid_display {
		qcom,dsi-display-active;
		};

		&qupv3_se17_i2c {
		status = "ok";

		synaptics_tcm@20 {
		compatible = "synaptics,tcm-i2c";
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <122 0x2008>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend";
		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		vdd-supply = <&pm8150_s4>;
		avdd-supply = <&pm8150_l17>;
		synaptics,pwr-reg-name = "avdd";
		synaptics,bus-reg-name = "vdd";
		synaptics,irq-gpio = <&tlmm 122 0x2008>;
		synaptics,irq-on-state = <0>;
		synaptics,reset-gpio = <&tlmm 54 0x00>;
		synaptics,reset-on-state = <0>;
		synaptics,reset-active-ms = <20>;
		synaptics,reset-delay-ms = <200>;
		synaptics,power-delay-ms = <200>;
		synaptics,ubl-i2c-addr = <0x20>;
		synaptics,extend_report;
		synaptics,firmware-name = "synaptics_firmware.img";
		};
		};

arch/arm64/boot/dts/qcom/sm8150-mtp.dtsi

+7 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,13 @@
		};
		};

		&dsi_panel_pwr_supply_vdd_no_labibb {
		qcom,panel-supply-entry@1 {
		qcom,supply-min-voltage = <1800000>;
		qcom,supply-max-voltage = <1800000>;
		};
		};

		&dsi_sharp_4k_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

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

+27 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-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
		@@ -32,6 +32,7 @@
		#include "dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi"
		#include "dsi-panel-sw43404-amoled-dsc-fhd-plus-cmd.dtsi"
		#include "dsi-panel-nt36850-truly-dualmipi-wqhd-cmd.dtsi"
		#include "dsi-panel-rm69299-visionox-amoled-fhd-plus-video.dtsi"
		#include <dt-bindings/clock/mdss-10nm-pll-clk.h>

		&tlmm {
		@@ -437,6 +438,17 @@
		qcom,dsi-panel = <&dsi_sim_sec_hd_cmd>;
		};

		dsi_rm69299_visionox_amoled_vid_display: qcom,dsi-display@23 {
		label = "dsi_rm69299_visionox_amoled_vid_display";
		qcom,display-type = "primary";

		qcom,dsi-ctrl-num = <0>;
		qcom,dsi-phy-num = <0>;
		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";

		qcom,dsi-panel = <&dsi_rm69299_visionox_amoled_video>;
		};

		sde_dsi: qcom,dsi-display-primary {
		compatible = "qcom,dsi-display";
		label = "primary";
		@@ -483,6 +495,7 @@
		&dsi_nt35695b_truly_fhd_video_display
		&dsi_sw43404_amoled_video_display
		&dsi_sw43404_amoled_fhd_plus_cmd_display
		&dsi_rm69299_visionox_amoled_vid_display
		&dsi_dual_nt36850_truly_cmd_display>;
		};

		@@ -592,6 +605,19 @@
		};
		};

		&dsi_rm69299_visionox_amoled_video {
		qcom,mdss-dsi-t-clk-post = <0x0E>;
		qcom,mdss-dsi-t-clk-pre = <0x31>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 20 08 08 24 23 08
		08 05 02 04 00 18 17];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_nt35597_truly_dsc_cmd {
		qcom,esd-check-enabled;
		qcom,mdss-dsi-panel-status-check-mode = "reg_read";