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 08/15] ARM: dts: qcom: mdm9615: split PMIC to separate dtsi files
Date: Tue, 27 Jun 2023 04:24:15 +0300 [thread overview]
Message-ID: <20230627012422.206077-9-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230627012422.206077-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/pm8018.dtsi | 57 +++++++++++++++++++
.../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 3 +-
arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 46 +--------------
3 files changed, 61 insertions(+), 45 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom/pm8018.dtsi
diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi
new file mode 100644
index 000000000000..81c0ad29fe60
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8018.dtsi
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Device Tree Source for Qualcomm PM8018
+ *
+ * Copyright (C) 2016 BayLibre, SAS.
+ * Author : Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+&ssbi {
+ pm8018: pmic {
+ compatible = "qcom,pm8018", "qcom,pm8921";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pwrkey@1c {
+ compatible = "qcom,pm8018-pwrkey",
+ "qcom,pm8921-pwrkey";
+ reg = <0x1c>;
+ interrupt-parent = <&pm8018>;
+ interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+ <51 IRQ_TYPE_EDGE_RISING>;
+ debounce = <15625>;
+ pull-up;
+ };
+
+ pm8018_mpps: mpps@50 {
+ compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
+ reg = <0x50>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8018_mpps 0 0 6>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+
+ rtc@11d {
+ compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
+ reg = <0x11d>;
+ interrupt-parent = <&pm8018>;
+ interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+ allow-set-time;
+ };
+
+ pm8018_gpio: gpio@150 {
+ compatible = "qcom,pm8058-gpio",
+ "qcom,ssbi-gpio";
+ reg = <0x150>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ gpio-ranges = <&pm8018_gpio 0 0 6>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
index 92c8003dac25..cc264861afe5 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
@@ -7,6 +7,7 @@
*/
#include "qcom-mdm9615.dtsi"
+#include "pm8018.dtsi"
/ {
model = "Sierra Wireless WP8548 Module";
@@ -76,7 +77,7 @@ reset-out-pins {
};
};
-&pmicgpio {
+&pm8018_gpio {
usb_vbus_5v_pins: usb-vbus-5v-state {
pins = "gpio4";
function = "normal";
diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
index b40c52ddf9b4..ac2327bc4ec5 100644
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
@@ -241,56 +241,14 @@ gsbi5_serial: serial@16440000 {
};
};
- qcom,ssbi@500000 {
+ ssbi: qcom,ssbi@500000 {
compatible = "qcom,ssbi";
reg = <0x500000 0x1000>;
qcom,controller-type = "pmic-arbiter";
- pmicintc: pmic {
- compatible = "qcom,pm8018", "qcom,pm8921";
+ pmic {
interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
- interrupt-controller;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pwrkey@1c {
- compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
- reg = <0x1c>;
- interrupt-parent = <&pmicintc>;
- interrupts = <50 IRQ_TYPE_EDGE_RISING>,
- <51 IRQ_TYPE_EDGE_RISING>;
- debounce = <15625>;
- pull-up;
- };
-
- pmicmpp: mpps@50 {
- compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
- interrupt-controller;
- #interrupt-cells = <2>;
- reg = <0x50>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&pmicmpp 0 0 6>;
- };
-
- rtc@11d {
- compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
- interrupt-parent = <&pmicintc>;
- interrupts = <39 IRQ_TYPE_EDGE_RISING>;
- reg = <0x11d>;
- allow-set-time;
- };
-
- pmicgpio: gpio@150 {
- compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
- reg = <0x150>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- gpio-ranges = <&pmicgpio 0 0 6>;
- #gpio-cells = <2>;
- };
};
};
--
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 ` [PATCH 02/15] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Dmitry Baryshkov
2023-06-27 11:04 ` 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 ` Dmitry Baryshkov [this message]
2023-06-27 14:08 ` [PATCH 08/15] ARM: dts: qcom: mdm9615: split PMIC " 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-9-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