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

Commit 1f95d8db 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: Support touch with 1080p display on 8974"

parents e2d07977 fa31999a

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

+16 −0
Original line number Diff line number Diff line
@@ -41,6 +41,22 @@ 
	};



	i2c@f9924000 {

		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupts = <61 0x2008>;

			vdd-supply = <&pm8941_l18>;

			vcc_i2c-supply = <&pm8941_lvs1>;

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

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

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,do-lockdown;

		};



		atmel_mxt_ts@4a {

			compatible = "atmel,mxt-ts";

			reg = <0x4a>;

arch/arm/boot/dts/msm8974-fluid.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -37,6 +37,22 @@ 
	};



	i2c@f9924000 {

		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupts = <61 0x2008>;

			vdd-supply = <&pm8941_l18>;

			vcc_i2c-supply = <&pm8941_lvs1>;

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

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

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,do-lockdown;

		};



		atmel_mxt_ts@4a {

			compatible = "atmel,mxt-ts";

			reg = <0x4a>;

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

+16 −0
Original line number Diff line number Diff line
@@ -37,6 +37,22 @@ 
	};



	i2c@f9924000 {

		synaptics@20 {

			compatible = "synaptics,rmi4";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupts = <61 0x2008>;

			vdd-supply = <&pm8941_l18>;

			vcc_i2c-supply = <&pm8941_lvs1>;

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

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

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

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,do-lockdown;

		};



		atmel_mxt_ts@4a {

			compatible = "atmel,mxt-ts";

			reg = <0x4a>;

arch/arm/boot/dts/msm8974.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -857,9 +857,11 @@ 
		reg-names = "qup_phys_addr";

		interrupts = <0 96 0>;

		interrupt-names = "qup_err_intr";

		qcom,i2c-bus-freq = <100000>;

		qcom,i2c-src-freq = <50000000>;

		qcom,i2c-bus-freq = <384000>;

		qcom,i2c-src-freq = <19200000>;

		qcom,master-id = <86>;

		qcom,scl-gpio = <&msmgpio 7 0>;

		qcom,sda-gpio = <&msmgpio 6 0>;

	};



	spi_0: spi@f9923000 { /* BLSP1 QUP1 */

arch/arm/boot/dts/msm8974pro-ac-mtp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ 


&soc {

	i2c@f9924000 {

		synaptics@20 {

			vdd-supply = <&pma8084_l18>;

			vcc_i2c-supply = <&pma8084_lvs1>;

		};



		atmel_mxt_ts@4a {

			vdd_ana-supply = <&pma8084_l18>;

			vcc_i2c-supply = <&pma8084_lvs1>;