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

Commit 476b0ec9 authored by Shantanu Jain's avatar Shantanu Jain
Browse files

ARM: dts: msm: move Focaltech touch node to SKUI's DTS 



Focaltech touch controller is used only on SKUI targets and
not on SKUIC. However, SKUI's DT file is included in SKUIC DT
file which results in unnecessary inclusion of Focaltech's node
in SKUIC dtb. As a result, Focaltech driver's probe is
unnecessary invoked on SKUIC targets and increases boot up time
as well. This change moves Focaltech touch controller's DT node
to SKUI specific DT files only thereby decreasing the bootup
time on SKUIC.

Change-Id: I8ab84ce6da94df7ec62cf45b6274dddd09936c82
Signed-off-by: default avatarShantanu Jain <shjain@codeaurora.org>
parent 7072ea14

arch/arm/boot/dts/qcom/msm8916-512mb-qrd-skui.dts

+48 −0
Original line number Diff line number Diff line
@@ -38,6 +38,54 @@ 
			regulator-name = "smb1360_otg_vreg";

		};

	};



	i2c@78b9000 { /* BLSP1 QUP5 */

		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8916_l17>;

			vcc_i2c-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			focaltech,name = "ft6436";

			focaltech,family-id = <0x36>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,irq-gpio = <&msm_gpio 13 0x2008>;

			focaltech,display-coords = <0 0 480 854>;

			focaltech,panel-coords = <0 0 480 950>;

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

			focaltech,no-force-update;

			focaltech,i2c-pull-up;

			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;

			focaltech,fw-upgrade-id2 = <0x18>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,ignore-id-check;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";

		qcom,disp-maxx = <480>;

		qcom,disp-maxy = <854>;

		qcom,panel-maxx = <480>;

		qcom,panel-maxy = <946>;

		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};

};



&pm8916_chg {

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dts

+48 −0
Original line number Diff line number Diff line
@@ -38,6 +38,54 @@ 
			regulator-name = "smb1360_otg_vreg";

		};

	};



	i2c@78b9000 { /* BLSP1 QUP5 */

		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8916_l17>;

			vcc_i2c-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			focaltech,name = "ft6436";

			focaltech,family-id = <0x36>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,irq-gpio = <&msm_gpio 13 0x2008>;

			focaltech,display-coords = <0 0 480 854>;

			focaltech,panel-coords = <0 0 480 950>;

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

			focaltech,no-force-update;

			focaltech,i2c-pull-up;

			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;

			focaltech,fw-upgrade-id2 = <0x18>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,ignore-id-check;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";

		qcom,disp-maxx = <480>;

		qcom,disp-maxy = <854>;

		qcom,panel-maxx = <480>;

		qcom,panel-maxy = <946>;

		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};

};



&pm8916_chg {

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi

+0 −48
Original line number Diff line number Diff line
@@ -14,54 +14,6 @@ 
#include "dsi-panel-otm8019a-fwvga-video.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8916_l17>;

			vcc_i2c-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			pinctrl-2 = <&ts_release>;

			focaltech,name = "ft6436";

			focaltech,family-id = <0x36>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,irq-gpio = <&msm_gpio 13 0x2008>;

			focaltech,display-coords = <0 0 480 854>;

			focaltech,panel-coords = <0 0 480 950>;

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

			focaltech,no-force-update;

			focaltech,i2c-pull-up;

			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;

			focaltech,fw-upgrade-id2 = <0x18>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,ignore-id-check;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";

		qcom,disp-maxx = <480>;

		qcom,disp-maxy = <854>;

		qcom,panel-maxx = <480>;

		qcom,panel-maxy = <946>;

		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};



	gpio-leds {

		compatible = "gpio-leds";

		status = "okay";