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

Commit a8cc7934 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: change touch DT node name to reflect correct slave address"

parents a75a9f8a 17effb01

arch/arm/boot/dts/qcom/msm8937-pmi8950-qrd-sku1-dvt1.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -65,7 +65,7 @@ 
	};



	i2c@78b7000 {

		synaptics@20 {

		synaptics@4b {

			vdd-supply = <&pm8937_l6>;

		};

	};

arch/arm/boot/dts/qcom/msm8937-pmi8950-qrd-sku1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


	i2c@78b7000 {

		status = "ok";

		synaptics@20 {

		synaptics@4b {

			compatible = "synaptics,dsx";

			reg = <0x4b>;

			interrupt-parent = <&tlmm>;

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


	i2c@78b7000 { /* BLSP1 QUP3 */

		status = "okay";

		synaptics@20 {

		synaptics@4b {

			compatible = "synaptics,dsx";

			reg = <0x4b>;

			interrupt-parent = <&tlmm>;