From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad
Date: Tue, 27 Jun 2023 04:24:09 +0300 [thread overview]
Message-ID: <20230627012422.206077-3-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230627012422.206077-1-dmitry.baryshkov@linaro.org>
To simplify MSM8960 CDP board file, add label to PMIC keypad node.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 20 +++++++++-----------
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 6c1bc3818883..4641b4f2195d 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -88,17 +88,15 @@ clk-pins {
};
};
-&pmicintc {
- keypad@148 {
- linux,keymap = <
- MATRIX_KEY(0, 0, KEY_VOLUMEUP)
- MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
- MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
- MATRIX_KEY(0, 3, KEY_CAMERA)
- >;
- keypad,num-rows = <1>;
- keypad,num-columns = <5>;
- };
+&pm8921_keypad {
+ linux,keymap = <
+ MATRIX_KEY(0, 0, KEY_VOLUMEUP)
+ MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)
+ MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)
+ MATRIX_KEY(0, 3, KEY_CAMERA)
+ >;
+ keypad,num-rows = <1>;
+ keypad,num-columns = <5>;
};
&rpm {
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index fa2013388d99..913bc6afd0a1 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -283,7 +283,7 @@ pwrkey@1c {
pull-up;
};
- keypad@148 {
+ pm8921_keypad: keypad@148 {
compatible = "qcom,pm8921-keypad";
reg = <0x148>;
interrupt-parent = <&pmicintc>;
--
2.39.2
next prev parent reply other threads:[~2023-06-27 1:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 1:24 [PATCH 00/15] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 01/15] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
2023-06-27 11:03 ` Konrad Dybcio
2023-06-27 1:24 ` Dmitry Baryshkov [this message]
2023-06-27 11:04 ` [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Konrad Dybcio
2023-06-27 1:24 ` [PATCH 03/15] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
2023-06-27 11:05 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 04/15] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
2023-06-27 11:06 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 05/15] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
2023-06-27 11:06 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 06/15] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
2023-06-27 11:07 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 07/15] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Dmitry Baryshkov
2023-06-27 11:12 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
2023-06-27 14:08 ` Neil Armstrong
2023-06-27 1:24 ` [PATCH 09/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 10/15] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
2023-06-27 1:24 ` [PATCH 11/15] ARM: dts: qcom: msm8974: move vreg-boost GPIO to board files Dmitry Baryshkov
2023-06-27 11:15 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 12/15] ARM: dts: qcom: apq8064: move RPM regulators " Dmitry Baryshkov
2023-06-27 11:19 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 13/15] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-06-27 11:20 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 14/15] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-06-27 11:21 ` Konrad Dybcio
2023-06-27 1:24 ` [PATCH 15/15] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
2023-06-27 11:22 ` 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=20230627012422.206077-3-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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