All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konrad Dybcio <konrad.dybcio@somainline.org>
To: ~postmarketos/upstreaming@lists.sr.ht
Cc: martin.botka@somainline.org,
	angelogioacchino.delregno@somainline.org,
	marijn.suijten@somainline.org, jamipkettunen@somainline.org,
	Konrad Dybcio <konrad.dybcio@somainline.org>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 03/14] arm64: dts: qcom: msm8998-laptops: Clean up DTs
Date: Sat, 30 Apr 2022 18:23:41 +0200	[thread overview]
Message-ID: <20220430162353.607709-3-konrad.dybcio@somainline.org> (raw)
In-Reply-To: <20220430162353.607709-1-konrad.dybcio@somainline.org>

Reorder properties to match new laptop DTs, change hex to dec.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts  | 14 ++++++++------
 arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts    |  9 +++++----
 .../boot/dts/qcom/msm8998-lenovo-miix-630.dts      |  9 +++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts b/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
index 37f994351565..102f3e9a79a1 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
@@ -16,20 +16,22 @@ &blsp1_i2c6 {
 
 	touchpad@15 {
 		compatible = "hid-over-i2c";
-		interrupt-parent = <&tlmm>;
-		interrupts = <0x7b IRQ_TYPE_LEVEL_LOW>;
 		reg = <0x15>;
-		hid-descr-addr = <0x0001>;
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&touchpad>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <123 IRQ_TYPE_LEVEL_LOW>;
+
+		hid-descr-addr = <0x0001>;
 	};
 
 	keyboard@3a {
 		compatible = "hid-over-i2c";
-		interrupt-parent = <&tlmm>;
-		interrupts = <0x25 IRQ_TYPE_LEVEL_LOW>;
 		reg = <0x3a>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <37 IRQ_TYPE_LEVEL_LOW>;
+
 		hid-descr-addr = <0x0001>;
 	};
 };
diff --git a/arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts b/arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts
index 1eb406b43fd7..38389c6a3f68 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts
@@ -16,13 +16,14 @@ &blsp1_i2c6 {
 
 	keyboard@3a {
 		compatible = "hid-over-i2c";
-		interrupt-parent = <&tlmm>;
-		interrupts = <0x79 IRQ_TYPE_LEVEL_LOW>;
 		reg = <0x3a>;
-		hid-descr-addr = <0x0001>;
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&touchpad>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <121 IRQ_TYPE_LEVEL_LOW>;
+
+		hid-descr-addr = <0x0001>;
 	};
 };
 
diff --git a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
index f55f6f3e3e5d..cf81c33a9d7e 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
@@ -16,13 +16,14 @@ &blsp1_i2c6 {
 
 	keyboard@3a {
 		compatible = "hid-over-i2c";
-		interrupt-parent = <&tlmm>;
-		interrupts = <0x79 IRQ_TYPE_LEVEL_LOW>;
 		reg = <0x3a>;
-		hid-descr-addr = <0x0001>;
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&touchpad>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <121 IRQ_TYPE_LEVEL_LOW>;
+
+		hid-descr-addr = <0x0001>;
 	};
 };
 
-- 
2.35.2


  parent reply	other threads:[~2022-04-30 16:24 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-30 16:23 [PATCH 01/14] arm64: dts: qcom: msm8998*: Fix TLMM and pin nodes Konrad Dybcio
2022-04-30 16:23 ` [PATCH 02/14] arm64: dts: qcom: msm8998-clamshell: Clean up the DT Konrad Dybcio
2022-04-30 16:23 ` Konrad Dybcio [this message]
2022-04-30 16:23 ` [PATCH 04/14] arm64: dts: qcom: msm8998-yoshino-lilac: Disable LVS1 Konrad Dybcio
2022-04-30 16:23 ` [PATCH 05/14] arm64: dts: qcom: msm8998-yoshino: Add USB extcon Konrad Dybcio
2022-04-30 16:23 ` [PATCH 06/14] arm64: dts: qcom: msm8998-yoshino: Remove simple-bus compatible from clocks{} Konrad Dybcio
2022-04-30 16:23 ` [PATCH 07/14] arm64: dts: qcom: msm8998-yoshino/oneplus: Use pm8005_regulators label Konrad Dybcio
2022-04-30 16:23 ` [PATCH 08/14] arm64: dts: qcom: msm8998-oneplus: Apply style fixes Konrad Dybcio
2022-04-30 16:23 ` [PATCH 09/14] arm64: dts: qcom: msm8998-fxtec: Use "okay" instead of "ok" Konrad Dybcio
2022-04-30 16:23 ` [PATCH 10/14] arm64: dts: qcom: msm8998*: Keep MMCC & MMSS_SMMU enabled by default Konrad Dybcio
2022-04-30 16:23 ` [PATCH 11/14] arm64: dts: qcom: msm8998-oneplus: Add clocks & GDSC to simplefb Konrad Dybcio
2022-04-30 16:23 ` [PATCH 12/14] arm64: dts: qcom: msm8998*: Clean up #includes Konrad Dybcio
2022-04-30 16:23 ` [PATCH 13/14] arm64: dts: qcom: msm8998-fxtec: Decouple from 8998 MTP Konrad Dybcio
2022-04-30 16:23 ` [PATCH 14/14] arm64: dts: qcom: msm8998-mtp: Merge and fix up the DT Konrad Dybcio
2022-06-28 20:18 ` [PATCH 01/14] arm64: dts: qcom: msm8998*: Fix TLMM and pin nodes Bjorn Andersson

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=20220430162353.607709-3-konrad.dybcio@somainline.org \
    --to=konrad.dybcio@somainline.org \
    --cc=agross@kernel.org \
    --cc=angelogioacchino.delregno@somainline.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jamipkettunen@somainline.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marijn.suijten@somainline.org \
    --cc=martin.botka@somainline.org \
    --cc=robh+dt@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.