From: Stephan Gerhold <stephan@gerhold.net>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephan Gerhold <stephan@gerhold.net>,
Andy Gross <agross@kernel.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
Amit Kucheria <amit.kucheria@linaro.org>,
~postmarketos/upstreaming@lists.sr.ht
Subject: [PATCH 13/14] arm64: dts: qcom: pm8916: Sort nodes
Date: Tue, 15 Sep 2020 09:12:20 +0200 [thread overview]
Message-ID: <20200915071221.72895-14-stephan@gerhold.net> (raw)
In-Reply-To: <20200915071221.72895-1-stephan@gerhold.net>
Sort nodes by unit address so we have a consistent order in pm8916.dtsi.
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
arch/arm64/boot/dts/qcom/pm8916.dtsi | 60 ++++++++++++++--------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index c7b22ac81452..f931cb0de231 100644
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/iio/qcom,spmi-vadc.h>
-#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
&spmi_bus {
@@ -12,13 +12,6 @@ pm8916_0: pmic@0 {
#address-cells = <1>;
#size-cells = <0>;
- rtc@6000 {
- compatible = "qcom,pm8941-rtc";
- reg = <0x6000>;
- reg-names = "rtc", "alarm";
- interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
- };
-
pon@800 {
compatible = "qcom,pm8916-pon";
reg = <0x800>;
@@ -48,28 +41,6 @@ watchdog {
};
};
- pm8916_gpios: gpios@c000 {
- compatible = "qcom,pm8916-gpio";
- reg = <0xc000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
- <0 0xc1 0 IRQ_TYPE_NONE>,
- <0 0xc2 0 IRQ_TYPE_NONE>,
- <0 0xc3 0 IRQ_TYPE_NONE>;
- };
-
- pm8916_mpps: mpps@a000 {
- compatible = "qcom,pm8916-mpp";
- reg = <0xa000>;
- gpio-controller;
- #gpio-cells = <2>;
- interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
- <0 0xa1 0 IRQ_TYPE_NONE>,
- <0 0xa2 0 IRQ_TYPE_NONE>,
- <0 0xa3 0 IRQ_TYPE_NONE>;
- };
-
pm8916_temp: temp-alarm@2400 {
compatible = "qcom,spmi-temp-alarm";
reg = <0x2400>;
@@ -111,6 +82,35 @@ adc-chan@f {
reg = <VADC_VDD_VADC>;
};
};
+
+ rtc@6000 {
+ compatible = "qcom,pm8941-rtc";
+ reg = <0x6000>;
+ reg-names = "rtc", "alarm";
+ interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+ };
+
+ pm8916_mpps: mpps@a000 {
+ compatible = "qcom,pm8916-mpp";
+ reg = <0xa000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
+ <0 0xa1 0 IRQ_TYPE_NONE>,
+ <0 0xa2 0 IRQ_TYPE_NONE>,
+ <0 0xa3 0 IRQ_TYPE_NONE>;
+ };
+
+ pm8916_gpios: gpios@c000 {
+ compatible = "qcom,pm8916-gpio";
+ reg = <0xc000>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
+ <0 0xc1 0 IRQ_TYPE_NONE>,
+ <0 0xc2 0 IRQ_TYPE_NONE>,
+ <0 0xc3 0 IRQ_TYPE_NONE>;
+ };
};
pm8916_1: pmic@1 {
--
2.28.0
next prev parent reply other threads:[~2020-09-15 7:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 7:12 [PATCH 00/14] Cleanup & sort msm8916.dtsi, various minor fixes Stephan Gerhold
2020-09-15 7:12 ` [PATCH 01/14] arm64: dts: qcom: msm8916: Configure DSI port with labels Stephan Gerhold
2020-09-15 7:12 ` [PATCH 02/14] arm64: dts: qcom: msm8916: Remove one more thermal trip point unit name Stephan Gerhold
2020-09-15 7:12 ` [PATCH 03/14] arm64: dts: qcom: pm8916: Remove invalid reg size from wcd_codec Stephan Gerhold
2020-09-15 7:12 ` [PATCH 04/14] arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts Stephan Gerhold
2020-09-15 7:12 ` [PATCH 05/14] arm64: dts: qcom: msm8916: Use IRQ defines, add IRQ types Stephan Gerhold
2020-09-15 7:12 ` [PATCH 06/14] arm64: dts: qcom: msm8916: Drop qcom,tcsr-mutex syscon Stephan Gerhold
2020-09-15 15:38 ` Bjorn Andersson
2020-09-15 7:12 ` [PATCH 07/14] arm64: dts: qcom: msm8916: Minor style fixes Stephan Gerhold
2020-09-15 7:12 ` [PATCH 08/14] arm64: dts: qcom: msm8916: Add MSM8916-specific compatibles to SCM/MSS Stephan Gerhold
2020-09-15 7:12 ` [PATCH 09/14] arm64: dts: qcom: msm8916: Use more generic node names Stephan Gerhold
2020-09-15 7:12 ` [PATCH 10/14] arm64: dts: qcom: msm8916: Rename "x-smp2p" to "smp2p-x" Stephan Gerhold
2020-09-15 7:12 ` [PATCH 11/14] arm64: dts: qcom: msm8916: Pad addresses Stephan Gerhold
2020-09-15 7:12 ` [PATCH 12/14] arm64: dts: qcom: msm8916: Sort nodes Stephan Gerhold
2020-09-15 7:12 ` Stephan Gerhold [this message]
2020-09-15 7:12 ` [PATCH 14/14] arm64: dts: qcom: Makefile: Sort lines Stephan Gerhold
2020-09-15 15:42 ` [PATCH 00/14] Cleanup & sort msm8916.dtsi, various minor fixes 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=20200915071221.72895-14-stephan@gerhold.net \
--to=stephan@gerhold.net \
--cc=agross@kernel.org \
--cc=amit.kucheria@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox