From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: devicetree@vger.kernel.org, Lee Jones <lee@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
linux-arm-msm@vger.kernel.org,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
linux-iio@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org, Pavel Machek <pavel@ucw.cz>,
linux-leds@vger.kernel.org
Subject: [PATCH v4 18/38] ARM: dts: qcom: msm8960: split PMIC to separate dtsi files
Date: Sun, 27 Aug 2023 03:59:00 +0300 [thread overview]
Message-ID: <20230827005920.898719-19-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230827005920.898719-1-dmitry.baryshkov@linaro.org>
The PMIC is not a part of the SoC, so move PMIC to a separate file and
include it from the board files.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm/boot/dts/qcom/pm8921.dtsi | 40 +++++++++++++++++++
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 1 +
.../qcom/qcom-msm8960-samsung-expressatt.dts | 3 +-
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 39 +-----------------
4 files changed, 44 insertions(+), 39 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi
diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
new file mode 100644
index 000000000000..414941f7a42f
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0
+
+&ssbi {
+ pm8921: pmic {
+ compatible = "qcom,pm8921";
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8921-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pm8921>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+ <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+
+ pm8921_keypad: keypad@148 {
+ compatible = "qcom,pm8921-keypad";
+ reg = <0x148>;
+ interrupt-parent = <&pm8921>;
+ interrupts = <74 IRQ_TYPE_EDGE_RISING>,
+ <75 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15>;
+ scan-delay = <32>;
+ row-hold = <91500>;
+ };
+
+ rtc@11d {
+ compatible = "qcom,pm8921-rtc";
+ interrupt-parent = <&pm8921>;
+ interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+ reg = <0x11d>;
+ allow-set-time;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 43149c90c4fc..a5ea4843db43 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -2,6 +2,7 @@
#include <dt-bindings/input/input.h>
#include "qcom-msm8960.dtsi"
+#include "pm8921.dtsi"
/ {
model = "Qualcomm MSM8960 CDP";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
index 9e203164beb6..1a5116336ff0 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/input/input.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
#include "qcom-msm8960.dtsi"
-#include <dt-bindings/reset/qcom,gcc-msm8960.h>
+#include "pm8921.dtsi"
/ {
model = "Samsung Galaxy Express SGH-I437";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index f1267c83d67a..774f507fa25a 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -259,47 +259,10 @@ gsbi5_serial: serial@16440000 {
};
};
- ssbi@500000 {
+ ssbi: ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
-
- pm8921: pmic {
- compatible = "qcom,pm8921";
- #interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pwrkey@1c {
- compatible = "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pm8921>;
- interrupts = <50 IRQ_TYPE_EDGE_RISING>,
- <51 IRQ_TYPE_EDGE_RISING>;
- debounce = <15625>;
- pull-up;
- };
-
- pm8921_keypad: keypad@148 {
- compatible = "qcom,pm8921-keypad";
- reg = <0x148>;
- interrupt-parent = <&pm8921>;
- interrupts = <74 IRQ_TYPE_EDGE_RISING>,
- <75 IRQ_TYPE_EDGE_RISING>;
- debounce = <15>;
- scan-delay = <32>;
- row-hold = <91500>;
- };
-
- rtc@11d {
- compatible = "qcom,pm8921-rtc";
- interrupt-parent = <&pm8921>;
- interrupts = <39 IRQ_TYPE_EDGE_RISING>;
- reg = <0x11d>;
- allow-set-time;
- };
- };
};
rng@1a500000 {
--
2.39.2
next prev parent reply other threads:[~2023-08-27 1:00 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-27 0:58 [PATCH v4 00/38] ARM: dts: qcom: cleanup PMIC usage Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 01/38] dt-bindings: input: qcom,pm8921-keypad: convert to YAML format Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 02/38] dt-bindings: mfd: qcom-pm8xxx: add missing child nodes Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 03/38] dt-bindings: mfd: qcom-pm8xxx: allow using interrupts-extended Dmitry Baryshkov
2023-08-27 8:35 ` Krzysztof Kozlowski
2023-08-27 10:42 ` Dmitry Baryshkov
2023-08-27 11:12 ` Krzysztof Kozlowski
2023-08-27 11:48 ` Dmitry Baryshkov
2023-08-27 12:00 ` Krzysztof Kozlowski
2023-08-27 12:57 ` Dmitry Baryshkov
2023-08-27 18:05 ` Krzysztof Kozlowski
2023-08-27 0:58 ` [PATCH v4 04/38] ARM: dts: qcom: apq8064: correct XOADC register address Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 05/38] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 06/38] ARM: dts: qcom: msm8660-surf: use keypad label directly Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 07/38] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 08/38] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 09/38] ARM: dts: qcom: strip prefix from PMIC files Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 10/38] ARM: dts: qcom: apq8064: fix PMIC node labels Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 11/38] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 12/38] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 13/38] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 14/38] ARM: dts: qcom: apq8064: move PMIC interrupts to the board files Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 15/38] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 16/38] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-27 0:58 ` [PATCH v4 17/38] ARM: dts: qcom: msm8960: " Dmitry Baryshkov
2023-08-27 0:59 ` Dmitry Baryshkov [this message]
2023-08-27 0:59 ` [PATCH v4 19/38] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 20/38] ARM: dts: qcom: mdm9615: split PMIC " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 21/38] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 22/38] ARM: dts: qcom: pm8058: reorder nodes Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 23/38] ARM: dts: qcom: pm8921: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 24/38] ARM: dts: qcom: pm8018: move reg property Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 25/38] ARM: dts: qcom: pm8921: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 26/38] ARM: dts: qcom: pm8058: use defined IRQ flags Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 27/38] ARM: dts: qcom: pm8921: switch to interrupts-extended Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 28/38] ARM: dts: qcom: pm8018: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 29/38] ARM: dts: qcom: pm8058: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 30/38] ARM: dts: qcom: apq8064: move RPM regulators to board files Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 31/38] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 32/38] ARM: dts: qcom: msm8660: " Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 33/38] ARM: dts: qcom: msm8960: drop useless rpm regulators node Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 34/38] ARM: dts: qcom: msm8974: move regulators to board files Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 35/38] ARM: dts: qcom: pm8921: Disable keypad by default Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 36/38] ARM: dts: qcom: apq8060-dragonboard: rename mpp ADC channels to adc-channel Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 37/38] ARM: dts: qcom: ipq8064: drop qcom, prefix from SSBI node name Dmitry Baryshkov
2023-08-27 0:59 ` [PATCH v4 38/38] ARM: dts: qcom: mdm9615: " Dmitry Baryshkov
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=20230827005920.898719-19-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=jic23@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=lee@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--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;
as well as URLs for NNTP newsgroup(s).