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

Commit 9ffe022c 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: Refactor touch controller's DT node"

parents 1100511a 8e5e4e6d

arch/arm/boot/dts/qcom/msm8916-qrd-skuh.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -241,6 +241,45 @@ 
			pinctrl-0 = <&cdc_pdm_lines_act>;

			pinctrl-1 = <&cdc_pdm_lines_sus>;

	};



	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@70 {

			compatible = "synaptics,rmi4";

			reg = <0x70>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&vdd_vreg>;

			vcc_i2c-supply = <&pm8916_l16>;

			/* pins used by touchscreen */

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

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			synaptics,display-coords = <0 0 1100 1756>;

			synaptics,panel-coords = <0 0 1100 1899>;

			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,fw-image-name = "PR1601177-s3207_8916_qrd_00430000.img";

		};

	};



	vdd_vreg: vdd_vreg {

		compatible = "regulator-fixed";

		status = "ok";

		regulator-name = "vdd_vreg";

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_rmi4_i2c";

		qcom,disp-maxx = <720>;

		qcom,disp-maxy = <1280>;

		qcom,panel-maxx = <720>;

		qcom,panel-maxy = <1369>;

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

	};

};



&pm8916_vadc {

arch/arm/boot/dts/qcom/msm8916-qrd.dtsi

+0 −39
Original line number Diff line number Diff line
@@ -20,45 +20,6 @@ 
};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@70 {

			compatible = "synaptics,rmi4";

			reg = <0x70>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&vdd_vreg>;

			vcc_i2c-supply = <&pm8916_l16>;

			/* pins used by touchscreen */

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

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			synaptics,display-coords = <0 0 1100 1756>;

			synaptics,panel-coords = <0 0 1100 1899>;

			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,fw-image-name = "PR1601177-s3207_8916_qrd_00430000.img";

		};

	};



	vdd_vreg: vdd_vreg {

		compatible = "regulator-fixed";

		status = "ok";

		regulator-name = "vdd_vreg";

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_rmi4_i2c";

		qcom,disp-maxx = <720>;

		qcom,disp-maxy = <1280>;

		qcom,panel-maxx = <720>;

		qcom,panel-maxy = <1369>;

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

	};



	i2c@78ba000 { /* BLSP1 QUP6 */

		nfc-nci@e {

			compatible = "qcom,nfc-nci";