Merge "ARM: dts: msm: Add nt36525 touch node for Scuba qrd"

#include "scuba-thermal-overlay.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include "scuba-sde-display.dtsi"

&soc {

	scuba_batterydata: qcom,battery-data {

			"chg_temp";

	qcom,thermal-mitigation = <2000000 1500000 1000000 500000>;

};

&pm2250_pwm3 {

	status = "ok";

};

&dsi_nt36525_truly_video {

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

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

	pwms = <&pm2250_pwm3 0 0>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

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

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

};

&sde_dsi {

	qcom,dsi-default-panel = <&dsi_nt36525_truly_video>;

};

&qupv3_se2_i2c {

	status = "ok";

	qcom,i2c-touch-active = "novatek,NVT-ts";

	novatek@62 {

		compatible = "novatek,NVT-ts";

		reg = <0x62>;

		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

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

		novatek,reset-gpio = <&tlmm 71 0x00>;

		novatek,irq-gpio = <&tlmm 80 0x2008>;

		panel = <&dsi_nt36525_truly_video>;

	};

};