Merge "ARM: dts: msm: enable circular touch on 8909W BG APQ V2A device"

&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			synaptics,display-coords = <0 0 479 479>;

			/delete-property/ synaptics,power-down;

			/delete-property/ synaptics,disable-gpios;

			synaptics,is_wake;

		};

		it7260@46 {

			compatible = "ite,it7260_ts";

			reg = <0x46>;

			compatible = "synaptics,dsx-i2c";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			avdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			interrupts = <98 0x2008>;

			vdd_ana-supply = <&pm660_l18>;

			vcc_i2c-supply = <&pm660_l13>;

			synaptics,pwr-reg-name = "vdd_ana";

			synaptics,bus-reg-name = "vcc_i2c";

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

							"pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_ite_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_ite_reset_suspend>;

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			ite,reset-gpio = <&msm_gpio 12 0x00>;

			ite,irq-gpio = <&msm_gpio 13 0x2008>;

			ite,panel-coords = <0 0 320 320>;

			ite,display-coords = <0 0 320 320>;

			ite,reset-delay = <20>;

			ite,num-fingers = <2>;

			ite,wakeup;

			ite,palm-detect-en;

			ite,palm-detect-keycode = <142>;

			ite,fw-name = "it7260_fw_050D0014.bin";

			ite,cfg-name = "it7260_cfg_62011E01.bin";

			ite,avdd-lpm-cur = <3000>;

		};

		it7260@46 {

			/* Update with PM660 regulator handles */

			/delete-property/ avdd-supply;

			/delete-property/ vdd-supply;

			synaptics,irq-gpio = <&msm_gpio 98 0x2008>;

			synaptics,irq-on-state = <0>;

			synaptics,irq-flags = <0x2008>;

			synaptics,power-delay-ms = <200>;

			synaptics,reset-delay-ms = <200>;

			synaptics,max-y-for-2d = <389>;

			synaptics,resume-in-workqueue;

			synaptics,x-flip;

			synaptics,y-flip;

			/delete-property/ synaptics,reset-gpio;

			/delete-property/ synaptics,display-coords;

			/delete-property/ synaptics,panel-coords;

			/delete-property/ synaptics,power-down;

			/delete-property/ synaptics,disable-gpios;

			/delete-property/ synaptics,is_wake;

		};

		/delete-node/ it7260@46;

	};

	qcom,blackghost {