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

This project is archived. Its data is read-only.

Commit 0a0b4d6f authored May 15, 2014 by Stepan Moskovchenko

ARM: dts: msm: Fix GPIO controller phandles on 8994



The device definitions in the board-specific DTSI files for
8994 Interposer targets have references to the 8974 GPIO
controller node. Refactor these to point to the the 8994
GPIO controller node, and create overrides for interposer
backward compatibility.

Change-Id: I563b36e5ca43b41ef8b2547236608c55347e0a27
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>

parent 5b118e36

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;
		};
		};