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

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

Merge "ARM: dts: msm: add touch device node for msm8909"

parents d0793553 d3b6c4a2

arch/arm/boot/dts/qcom/msm8909-cdp.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -14,6 +14,39 @@ 
#include "msm8909-pinctrl.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8909_l17>;

			vcc_i2c-supply = <&pm8909_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,irq-gpio = <&msm_gpio 13 0x2008>;

			synaptics,reset-gpio = <&msm_gpio 12 0x0>;

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,display-coords = <0 0 719 1279>;

			synaptics,panel-coords = <0 0 719 1405>;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_rmi4_i2c";

		qcom,disp-maxx = <719>;

		qcom,disp-maxy = <1279>;

		qcom,panel-maxx = <719>;

		qcom,panel-maxy = <1405>;

		qcom,key-codes = <158 139 172 217>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/msm8909-mtp.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -14,6 +14,39 @@ 
#include "msm8909-pinctrl.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8909_l17>;

			vcc_i2c-supply = <&pm8909_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,irq-gpio = <&msm_gpio 13 0x2008>;

			synaptics,reset-gpio = <&msm_gpio 12 0x0>;

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,display-coords = <0 0 719 1279>;

			synaptics,panel-coords = <0 0 719 1405>;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_rmi4_i2c";

		qcom,disp-maxx = <719>;

		qcom,disp-maxy = <1279>;

		qcom,panel-maxx = <719>;

		qcom,panel-maxy = <1405>;

		qcom,key-codes = <158 139 172 217>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/msm8909-pinctrl.dtsi

+60 −0
Original line number Diff line number Diff line
@@ -504,5 +504,65 @@ 
				bias-pull-up;

			};

		};



		/* add pingrp for touchscreen */

		pmx_ts_int_active {

			qcom,pins = <&gp 13>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_ts_int_active";



			ts_int_active: ts_int_active {

				drive-strength = <8>;

				bias-pull-up;

			};

		};



		pmx_ts_int_suspend {

			qcom,pins = <&gp 13>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_ts_int_suspend";



			ts_int_suspend: ts_int_suspend {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		pmx_ts_reset_active {

			qcom,pins = <&gp 12>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_ts_reset_active";



			ts_reset_active: ts_reset_active {

				drive-strength = <8>;

				bias-pull-up;

			};

		};



		pmx_ts_reset_suspend {

			qcom,pins = <&gp 12>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_ts_reset_suspend";



			ts_reset_suspend: ts_reset_suspend {

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		pmx_ts_release {

			qcom,pins = <&gp 13>, <&gp 12>;

			qcom,num-grp-pins = <2>;

			label = "pmx_ts_release";



			ts_release: ts_release {

				drive-strength = <2>;

				bias-pull-down;

			};

		};

	};

};