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

Commit cf7d6825 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I580d46d2,I553db004 into kernel.lnx.4.9.r12-rel 

* changes:
  ARM: dts: enable dfps for msm8940 cdp device
  ARM: dts: msm: add device tree overlay for msm8940 CDP
parents 65d6b8b3 2657dda0

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ compatible = "qcom,msm8917-rumi" 
compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8940-mtp"

compatible = "qcom,msm8940-cdp"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

compatible = "qcom,msm8926-qrd"

Documentation/devicetree/bindings/input/touchscreen/maxim-sti.txt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
Maxim STI touch controller:



Required properties:

- spi-max-frequency: Maximum SPI frequency supported by the controller.

- avdd-supply: analog power supply.

- dvdd-supply: digial power supply.

- maxim_sti,irq-gpio: irq gpio.

- maxim_sti,reset-gpio: reset gpio.

- maxim_sti,touch_fusion: path to touch_fusion daemon.

- maxim_sti,config_file: path to config file.

- maxim_sti,fw_name: name of firmware file.



Optional properties:

 - pinctrl-names	: this should be defined if a target uses pinctrl framework.

			See "pinctrl" in documentation/devicetree/bindings/pinctrl/msm-pinctrl.txt.

			It should specify the names of the configs that pinctrl can install in driver.

			Following are the pinctrl configs that can be installed:

			"pmx_ts_active" : active configuration of pins. This should specify active

			config defined in pin groups of interrupt and reset gpios.

			"pmx_ts_suspend" : disabled configuration of pins. This should specify sleep

			config defined in pin groups of interrupt and reset gpios.

 - maxim_sti,mt_type_b_enabled	: Boolean type. This should be used to enable type B multitouch protocol.

Example:



&spi_13 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <65 0>;

		spi-max-frequency = <16000000>;

		avdd-supply = <&pm8950_l17>;

		dvdd-supply = <&pm8950_l6>;

		spi-supply = <&pm8950_l5>;

		maxim_sti,irq-gpio = <&msm_gpio 65 0x00>;

		maxim_sti,reset-gpio = <&msm_gpio 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/vendor/firmware/touch_fusion_panel_id_0x%04x.cfg";

		maxim_sti,fw_name = "maxim_fp35.bin";

		maxim_sti,mt_type_b_enabled;

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

       };

};

arch/arm64/boot/dts/qcom/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

dtbo-$(CONFIG_ARCH_MSM8940) += msm8940-mtp-overlay.dtbo

dtbo-$(CONFIG_ARCH_MSM8940) += msm8940-cdp-overlay.dtbo



dtbo-$(CONFIG_ARCH_MSM8917) += msm8917-mtp-overlay.dtbo \

	msm8917-qrd-overlay.dtbo \
@@ -392,6 +393,10 @@ msm8940-mtp-overlay.dtbo-base := msm8940-pmi8950.dtb \ 
	msm8940-pmi8937.dtb \

	msm8940-pmi8940.dtb



msm8940-cdp-overlay.dtbo-base := msm8940-pmi8950.dtb \

	msm8940-pmi8937.dtb \

	msm8940-pmi8940.dtb



msm8917-mtp-overlay.dtbo-base := msm8917-pmi8950.dtb \

	msm8917-pmi8937.dtb \

	msm8917-pmi8940.dtb

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

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

 * Copyright (c) 2015-2016, 2018-2019, 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 <dt-bindings/clock/msm-clocks-8952.h>



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";

		pinctrl-0 = <&gpio_key_active>;

		pinctrl-1 = <&gpio_key_suspend>;



		camera_focus {

			label = "camera_focus";

			gpios = <&tlmm 128 0x1>;

			linux,input-type = <1>;

			linux,code = <0x210>;

			debounce-interval = <15>;

		};



		camera_snapshot {

			label = "camera_snapshot";

			gpios = <&tlmm 127 0x1>;

			linux,input-type = <1>;

			linux,code = <0x2fe>;

			debounce-interval = <15>;

		};



		vol_up {

			label = "volume_up";

			gpios = <&tlmm 91 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};



		home {

			label = "home";

			gpios = <&tlmm 86 0x1>;

			linux,input-type = <1>;

			linux,code = <102>;

			debounce-interval = <15>;

		};

	};



	hbtp {

		compatible = "qcom,hbtp-input";

		vcc_dig-supply = <&pm8937_l5>;

		qcom,dig-load = <15000>;

		qcom,dig-vtg-min = <1800000>;

		qcom,dig-vtg-max = <1800000>;

	};

};



&tlmm {

	tlmm_gpio_key {

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

				function = "gpio";

			};



			config {

				pins = "gpio86", "gpio91", "gpio127", "gpio128";

			};

		};

	};

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};



&pmi_haptic{

	qcom,wave-play-rate-us = <4165>;

	qcom,lra-auto-res-mode="qwd";

	qcom,lra-high-z="opt1";

	qcom,lra-res-cal-period = <4>;

	qcom,correct-lra-drive-freq;

	qcom,misc-trim-error-rc19p2-clk-reg-present;

};



&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pm8937_l8>;

	qcom,vdd-voltage-level = <2900000 2900000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&pm8937_l5>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <200 325000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on  &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000

								384000000>;

	qcom,nonremovable;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";



	status = "ok";

};



&sdhc_2 {

	/* device core power supply */

	vdd-supply = <&pm8937_l11>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <15000 800000>;



	/* device communication power supply */

	vdd-io-supply = <&pm8937_l12>;

	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 22000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 125 0

		1 &intc 0 221 0

		2 &tlmm 67 0>;

	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&tlmm 67 0x1>;



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

								200000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";



	status = "ok";



};



&pm8937_gpios {

	gpio@c400 {

		qcom,mode = <0>;

		qcom,output-type = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,out-strength = <3>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};

};



&spi_3 { /* BLSP1 QUP3 */

	maxim_sti@0 {

		status = "disabled";

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0>;

		spi-max-frequency = <16000000>;

		avdd-supply = <&pm8937_l10>;

		dvdd-supply = <&pm8937_l5>;

		maxim_sti,irq-gpio = <&tlmm 65 0x00>;

		maxim_sti,reset-gpio = <&tlmm 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/etc/firmware/qtc800s.cfg";

		maxim_sti,fw_name = "qtc800s.bin";

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

	};

};



&i2c_5 { /* BLSP2 QUP1 */

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&tlmm 17 0x00>;

		qcom,nq-ven = <&tlmm 16 0x00>;

		qcom,nq-firm = <&tlmm 130 0x00>;

		qcom,nq-clkreq = <&pm8937_gpios 5 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <17 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

		clocks = <&clock_gcc clk_bb_clk2_pin>;

		clock-names = "ref_clk";

	};

};



#include "msm8937-mdss-panels.dtsi"



&mdss_mdp {

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

};



&mdss_dsi {

	hw-config = "dual_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 {

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,bridge-index = <0>;



	qcom,pluggable;

	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>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-min-refresh-rate = <48>;

	qcom,mdss-dsi-max-refresh-rate = <60>;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};



&dsi_truly_1080_cmd {

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

	qcom,ulps-enabled;

	qcom,partial-update-enabled;

	qcom,panel-roi-alignment = <2 2 4 2 1080 2>;

};



&dsi_truly_720_vid {

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

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};

arch/arm64/boot/dts/qcom/msm8940-cdp-overlay.dts

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

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

 */



/dts-v1/;

/plugin/;



#include "msm8937-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8940-PMI8950 CDP";

	compatible = "qcom,msm8940-cdp", "qcom,msm8940", "qcom,cdp";

	qcom,board-id= <1 0>;

	qcom,msm-id = <313 0x0>;

};