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

Commit 1e466f41 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: Fix GPIO controller phandles on 8994"

parents 1f8241d1 0a0b4d6f

arch/arm/boot/dts/qcom/msm8994-cdp-interposer.dts

+10 −0
Original line number Diff line number Diff line
@@ -52,3 +52,13 @@ 
	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

			interrupt-parent = <&msmgpio>;

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

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

		};

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -224,14 +224,14 @@ 
		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <61 0x2008>;

			vdd-supply = <&pm8994_l14>;

			avdd-supply = <&pm8994_l22>;

			synaptics,display-coords = <0 0 1599 2559>;

			synaptics,panel-coords = <0 0 1599 2703>;

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

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

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

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

			synaptics,disable-gpios;

		};

	};

arch/arm/boot/dts/qcom/msm8994-mtp-interposer.dts

+10 −0
Original line number Diff line number Diff line
@@ -60,3 +60,13 @@ 
	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 192000000 384000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

};



&soc {

	i2c@f9924000 {

		synaptics@20 {

			interrupt-parent = <&msmgpio>;

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

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

		};

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -224,14 +224,14 @@ 
		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x20>;

			interrupt-parent = <&msmgpio>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <61 0x2008>;

			vdd-supply = <&pm8994_l14>;

			avdd-supply = <&pm8994_l22>;

			synaptics,display-coords = <0 0 1599 2559>;

			synaptics,panel-coords = <0 0 1599 2703>;

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

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

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

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

			synaptics,disable-gpios;

		};

	};