From: Konrad Dybcio <konrad.dybcio@somainline.org>
To: phone-devel@vger.kernel.org
Cc: ~postmarketos/upstreaming@lists.sr.ht,
martin.botka@somainline.org,
angelogioacchino.delregno@somainline.org,
marijn.suijten@somainline.org,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 36/41] arm64: dts: qcom: sdm630-nile: Add Synaptics touchscreen.
Date: Fri, 26 Feb 2021 21:04:06 +0100 [thread overview]
Message-ID: <20210226200414.167762-37-konrad.dybcio@somainline.org> (raw)
In-Reply-To: <20210226200414.167762-1-konrad.dybcio@somainline.org>
Delete the node on Ganges devices, as they use a different one.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
.../qcom/sdm630-sony-xperia-ganges-kirin.dts | 2 ++
.../dts/qcom/sdm630-sony-xperia-nile.dtsi | 36 ++++++++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
index aea949265a2d..a4e1fb8ca52d 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
@@ -20,4 +20,6 @@ framebuffer@9d400000 {
};
};
+/* Ganges devices feature a Novatek touchscreen instead. */
+/delete-node/ &touchscreen;
/delete-node/ &vreg_l18a_1v8;
diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index deadd8f6ff3a..5f1202ae954b 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -161,7 +161,29 @@ extcon_usb: extcon-usb {
&blsp_i2c1 {
status = "okay";
- /* Synaptics touchscreen */
+ touchscreen: synaptics-rmi4-i2c@70 {
+ compatible = "syna,rmi4-i2c";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ interrupts-extended = <&tlmm 45 0x2008>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts_int_active &ts_lcd_id_active>;
+
+ syna,reset-delay-ms = <200>;
+ syna,startup-delay-ms = <220>;
+
+ rmi4-f01@1 {
+ reg = <0x01>;
+ syna,nosleep-mode = <1>;
+ };
+
+ rmi4-f11@11 {
+ reg = <0x11>;
+ syna,sensor-type = <1>;
+ };
+ };
};
&blsp_i2c2 {
@@ -552,6 +574,18 @@ &sdhc_1 {
&tlmm {
gpio-reserved-ranges = <8 4>;
+ ts_int_active: ts-int-active {
+ pins = "gpio45";
+ drive-strength = <8>;
+ bias-pull-up;
+ };
+
+ ts_lcd_id_active: ts-lcd-id-active {
+ pins = "gpio56";
+ drive-strength = <8>;
+ bias-disable;
+ };
+
imx300_vana_default: imx300-vana-default {
pins = "gpio50";
function = "gpio";
--
2.30.1
next prev parent reply other threads:[~2021-02-26 20:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 20:03 [PATCH 00/41] SDM630/636/660/Nile&Ganges DT feature enablement Konrad Dybcio
2021-02-26 20:03 ` [PATCH 01/41] arm64: dts: qcom: sdm630: Rewrite memory map Konrad Dybcio
2021-02-26 20:03 ` [PATCH 02/41] arm64: dts: qcom: sdm630: Add RPMPD nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 03/41] arm64: dts: qcom: sdm630: Add MMCC node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 04/41] arm64: dts: qcom: sdm630: Add interconnect provider nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 05/41] arm64: dts: qcom: sdm630: Add MDSS nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 06/41] arm64: dts: qcom: sdm630: Fix intc reg indentation Konrad Dybcio
2021-02-26 20:19 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 07/41] arm64: dts: qcom: sdm630: Add qfprom subnodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 08/41] arm64: dts: qcom: sdm630: Add USB configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 09/41] arm64: dts: qcom: sdm630: Fix TLMM node and pinctrl configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 10/41] arm64: dts: qcom: sdm630: Add SDHCI2 node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 11/41] arm64: dts: qcom: sdm630: Add interconnect and opp table to sdhc_1 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 12/41] arm64: dts: qcom: sdm630: Add GPU Clock Controller node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 13/41] arm64: dts: qcom: sdm630: Add clocks and power domains to SMMU nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 14/41] arm64: dts: qcom: sdm630: Add qcom,adreno-smmu compatible Konrad Dybcio
2021-02-26 20:03 ` [PATCH 15/41] arm64: dts: qcom: sdm630: Add TSENS node Konrad Dybcio
2021-03-08 17:23 ` Rob Herring
2021-02-26 20:03 ` [PATCH 16/41] arm64: dts: qcom: sdm630: Add modem/ADSP SMP2P nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 17/41] arm64: dts: qcom: sdm630: Add thermal-zones configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 18/41] arm64: dts: qcom: sdm630: Add ADSP remoteproc configuration Konrad Dybcio
2021-02-26 20:03 ` [PATCH 19/41] arm64: dts: qcom: sdm630: Raise tcsr_mutex_regs size Konrad Dybcio
2021-02-26 20:03 ` [PATCH 20/41] arm64: dts: qcom: sdm630: Add Adreno 508 GPU configuration Konrad Dybcio
2021-02-26 21:09 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 21/41] arm64: dts: qcom: pm660: Support SPMI regulators on PMIC sid 1 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 22/41] arm64: dts: qcom: pm660l: Add WLED support Konrad Dybcio
2021-02-26 20:03 ` [PATCH 23/41] arm64: dts: qcom: pm660l: Support SPMI regulators on PMIC sid 3 Konrad Dybcio
2021-02-26 20:03 ` [PATCH 24/41] arm64: dts: qcom: pm660(l): Add VADC and temp alarm nodes Konrad Dybcio
2021-02-26 20:03 ` [PATCH 25/41] arm64: dts: qcom: sdm660: Make the DTS an overlay on top of 630 Konrad Dybcio
2021-02-26 21:08 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 26/41] arm64: dts: qcom: Add device tree for SDM636 Konrad Dybcio
2021-02-26 21:08 ` Konrad Dybcio
2021-02-26 20:03 ` [PATCH 27/41] arm64: dts: qcom: sdm630: Add IMEM node Konrad Dybcio
2021-02-26 20:03 ` [PATCH 28/41] arm64: dts: qcom: sdm630: Configure the camera subsystem Konrad Dybcio
2021-02-26 20:03 ` [PATCH 29/41] arm64: dts: qcom: sdm660: Add required nodes for DSI1 Konrad Dybcio
2021-02-26 20:04 ` [PATCH 30/41] arm64: dts: qcom: sdm630-xperia-nile: Add all RPM and fixed regulators Konrad Dybcio
2021-02-26 20:04 ` [PATCH 31/41] arm64: dts: qcom: sdm630-nile: Use &labels Konrad Dybcio
2021-02-26 20:04 ` [PATCH 32/41] arm64: dts: qcom: sdm630-nile: Add USB Konrad Dybcio
2021-02-26 20:04 ` [PATCH 33/41] arm64: dts: qcom: sdm630-nile: Add Volume up key Konrad Dybcio
2021-02-26 20:04 ` [PATCH 34/41] arm64: dts: qcom: sdm630-nile: Configure WCN3990 Bluetooth Konrad Dybcio
2021-02-27 10:40 ` Konrad Dybcio
2021-02-27 11:02 ` Martin Botka
2021-03-08 23:07 ` Bjorn Andersson
2021-02-26 20:04 ` [PATCH 35/41] arm64: dts: qcom: sdm630-xperia: Retire sdm630-sony-xperia-ganges.dtsi Konrad Dybcio
2021-02-26 20:04 ` Konrad Dybcio [this message]
2021-02-26 20:04 ` [PATCH 37/41] arm64: dts: qcom: sdm630-nile: Specify ADSP firmware name Konrad Dybcio
2021-02-26 20:04 ` [PATCH 38/41] arm64: dts: qcom: sdm630-nile: Enable uSD card slot Konrad Dybcio
2021-02-26 20:04 ` [PATCH 39/41] arm64: dts: qcom: sdm630-nile: Remove gpio-keys autorepeat Konrad Dybcio
2021-02-26 20:04 ` [PATCH 40/41] arm64: dts: qcom: sdm630: Add I2C functions to I2C pins Konrad Dybcio
2021-02-26 20:04 ` [PATCH 41/41] arm64: dts: qcom: sdm630: Add DMA to I2C hosts Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210226200414.167762-37-konrad.dybcio@somainline.org \
--to=konrad.dybcio@somainline.org \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=martin.botka@somainline.org \
--cc=phone-devel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).