Merge "ARM: dts: msm: add new touch device for Spyro" (be918bf5) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/msm8937-pinctrl.dtsi

+30 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,36 @@
		};
		};

		i2c_4 {
		i2c_4_active: i2c_4_active {
		/* active state */
		mux {
		pins = "gpio14", "gpio15";
		function = "blsp_i2c4";
		};

		config {
		pins = "gpio14", "gpio15";
		drive-strength = <2>;
		bias-disable;
		};
		};

		i2c_4_sleep: i2c_4_sleep {
		/* suspended state */
		mux {
		pins = "gpio14", "gpio15";
		function = "gpio";
		};

		config {
		pins = "gpio14", "gpio15";
		drive-strength = <2>;
		bias-disable;
		};
		};
		};

		i2c_5 {
		i2c_5_active: i2c_5_active {
		/* active state */

arch/arm64/boot/dts/qcom/msm8937.dtsi

+28 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2019, 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
		@@ -144,6 +144,7 @@
		i2c5 = &i2c_5;
		spi3 = &spi_3;
		i2c3 = &i2c_3;
		i2c4 = &i2c_4;
		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
		sdhc2 = &sdhc_2; /* SDC2 for SD card */
		};
		@@ -588,6 +589,32 @@
		status = "disabled";
		};

		i2c_4: i2c@78b8000 { /* BLSP1 QUP4 */
		compatible = "qcom,i2c-msm-v2";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "qup_phys_addr";
		reg = <0x78b8000 0x600>;
		interrupt-names = "qup_irq";
		interrupts = <0 98 0>;
		qcom,clk-freq-out = <400000>;
		qcom,clk-freq-in = <19200000>;
		clock-names = "iface_clk", "core_clk";
		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
		<&clock_gcc clk_gcc_blsp1_qup4_i2c_apps_clk>;

		pinctrl-names = "i2c_active", "i2c_sleep";
		pinctrl-0 = <&i2c_4_active>;
		pinctrl-1 = <&i2c_4_sleep>;
		qcom,noise-rjct-scl = <0>;
		qcom,noise-rjct-sda = <0>;
		qcom,master-id = <86>;
		dmas = <&dma_blsp1 10 64 0x20000020 0x20>,
		<&dma_blsp1 11 32 0x20000020 0x20>;
		dma-names = "tx", "rx";
		status = "disabled";
		};

		i2c_5: i2c@7af5000 { /* BLSP2 QUP1 */
		compatible = "qcom,i2c-msm-v2";
		#address-cells = <1>;

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi

+150 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,156 @@
		};
		};

		&i2c_4 {
		status = "ok";

		tsc@24 {
		compatible = "cy,cyttsp5_i2c_adapter";
		reg = <0x24>;

		interrupt-parent = <&tlmm>;
		interrupts = <65 0x2008>;
		cy,adapter_id = "cyttsp5_i2c_adapter";
		vcc_i2c-supply = <&L13A>;
		vdd-supply = <&L15A>;
		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>;

		cy,core {
		cy,name = "cyttsp5_core";
		cy,irq_gpio = <65>;
		cy,rst_gpio = <64>;
		cy,hid_desc_register = <1>;
		cy,flags = <4>;
		cy,easy_wakeup_gesture = <1>;
		cy,btn_keys = <172 139 158 217 114 115 212 116>;
		cy,btn_keys-tag = <0>;

		cy,mt {
		cy,name = "cyttsp5_mt";

		cy,inp_dev_name = "cyttsp5_mt";
		cy,flags = <0x28>;
		cy,abs =
		<0x35 0 320 0 0
		0x36 0 360 0 0
		0x3a 0 255 0 0
		0xffff 0 255 0 0
		0x39 0 15 0 0
		0x30 0 255 0 0
		0x31 0 255 0 0
		0x34 0xffffff81 127 0 0
		0x37 0 1 0 0
		0x3b 0 255 0 0>;

		cy,vkeys_x = <320>;
		cy,vkeys_y = <360>;

		cy,virtual_keys =
		<158 1360 90 160 180
		139 1360 270 160 180
		172 1360 450 160 180
		217 1360 630 160 180>;
		};

		cy,btn {
		cy,name = "cyttsp5_btn";

		cy,inp_dev_name = "cyttsp5_btn";
		};

		cy,proximity {
		cy,name = "cyttsp5_proximity";

		cy,inp_dev_name = "cyttsp5_proximity";
		cy,abs = <0x19 0 1 0 0>;
		};
		};
		};

		};

		&tlmm {
		pmx_ts_int_active {
		ts_int_active: ts_int_active {
		mux {
		pins = "gpio65";
		function = "gpio";
		};

		config {
		pins = "gpio65";
		drive-strength = <8>;
		bias-pull-up;
		};
		};
		};

		pmx_ts_int_suspend {
		ts_int_suspend: ts_int_suspend {
		mux {
		pins = "gpio65";
		function = "gpio";
		};

		config {
		pins = "gpio65";
		drive-strength = <2>;
		bias-pull-down;
		};
		};
		};

		pmx_ts_reset_active {
		ts_reset_active: ts_reset_active {
		mux {
		pins = "gpio64";
		function = "gpio";
		};

		config {
		pins = "gpio64";
		drive-strength = <8>;
		bias-pull-up;
		};
		};
		};

		pmx_ts_reset_suspend {
		ts_reset_suspend: ts_reset_suspend {
		mux {
		pins = "gpio64";
		function = "gpio";
		};

		config {
		pins = "gpio64";
		drive-strength = <2>;
		bias-pull-down;
		};
		};
		};

		pmx_ts_release {
		ts_release: ts_release {
		mux {
		pins = "gpio65", "gpio64";
		function = "gpio";
		};

		config {
		pins = "gpio65", "gpio64";
		drive-strength = <2>;
		bias-pull-down;
		};
		};
		};

		};

		&modem_mem {
		reg = <0x0 0x86800000 0x0 0x5000000>;
		};