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

Commit 6d6cf5d8 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 support for Synaptics touch controller"

parents 6e059bb8 c4da706e

arch/arm/boot/dts/msm8610-cdp.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -76,6 +76,21 @@ 
				];

			};

		};



		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupts = <1 0x2008>;

			vdd-supply = <&pm8110_l19>;

			vcc_i2c-supply = <&pm8110_l14>;

			synaptics,reset-gpio = <&msmgpio 0 0x00>;

			synaptics,irq-gpio = <&msmgpio 1 0x2008>;

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

		};

	};



	gen-vkeys {

arch/arm/boot/dts/msm8610-mtp.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -76,6 +76,21 @@ 
				];

			};

		};



		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupts = <1 0x2008>;

			vdd-supply = <&pm8110_l19>;

			vcc_i2c-supply = <&pm8110_l14>;

			synaptics,reset-gpio = <&msmgpio 0 0x00>;

			synaptics,irq-gpio = <&msmgpio 1 0x2008>;

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

		};

	};



	i2c@f9925000 {