Merge "ARM: dts: msm: Add touch volume-up key and green led for QRD msmtitanium"

	};

};

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

		vol_up {

			label = "volume_up";

			gpios = <&tlmm 85 0x1>;

			linux,input-type = <1>;

			linux,code = <115>;

			debounce-interval = <15>;

		};

	};

	i2c@78b7000 { /* BLSP1 QUP3 */

		status = "okay";

		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x4b>;

			interrupt-parent = <&tlmm>;

			interrupts = <65 0x2008>;

			avdd-supply = <&pmtitanium_l17>;

			vdd-supply = <&pmtitanium_l6>;

			/* pins used by touchscreen */

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

			synaptics,display-coords = <0 0 1079 1919>;

			synaptics,panel-coords = <0 0 1079 1919>;

			synaptics,irq-gpio = <&tlmm 65 0x2008>;

			synaptics,reset-gpio = <&tlmm 64 0x0>;

			synaptics,disable-gpios;

			synaptics,button-map = <139 172 158>;

		};

	};

};

&spmi_bus {

	qcom,pmi8950@2 {

		qcom,leds@a100 {

			status = "okay";

			qcom,led_mpp_2 {

				label = "mpp";

				linux,name = "green";

				linux,default-trigger = "none";

				qcom,default-state = "off";

				qcom,max-current = <40>;

				qcom,current-setting = <5>;

				qcom,id = <6>;

				qcom,mode = "manual";

				qcom,source-sel = <1>;

				qcom,mode-ctrl = <0x60>;

			};

		};

	};

};

&pmi8950_charger {

	qcom,battery-data = <&qrd_batterydata>;

	qcom,float-voltage-mv = <4400>;