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 09/14] arm64: dts: qcom: msm8916: Use more generic node names
Date: Tue, 15 Sep 2020 09:12:16 +0200 [thread overview]
Message-ID: <20200915071221.72895-10-stephan@gerhold.net> (raw)
In-Reply-To: <20200915071221.72895-1-stephan@gerhold.net>
Now that all MSM8916 boards are referencing nodes by label instead
of name, we can easily make some more nodes use more generic names
(as recommended in the device tree specification or the binding
documentation).
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
.../qcom/msm8916-samsung-a2015-common.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916.dtsi | 10 ++++-----
arch/arm64/boot/dts/qcom/pm8916.dtsi | 22 +++++++++----------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 2ba649bffd4e..b18d21e42f59 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -81,7 +81,7 @@ i2c-muic {
#address-cells = <1>;
#size-cells = <0>;
- muic: sm5502@25 {
+ muic: extcon@25 {
compatible = "siliconmitus,sm5502-muic";
reg = <0x25>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index b2669643a12d..4444d068343c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -714,7 +714,7 @@ sound: sound@7702000 {
reg-names = "mic-iomux", "spkr-iomux";
};
- lpass: lpass@7708000 {
+ lpass: audio-controller@7708000 {
status = "disabled";
compatible = "qcom,lpass-cpu-apq8016";
clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
@@ -743,7 +743,7 @@ lpass: lpass@7708000 {
#size-cells = <0>;
};
- lpass_codec: codec@771c000 {
+ lpass_codec: audio-codec@771c000 {
compatible = "qcom,msm8916-wcd-digital-codec";
reg = <0x0771c000 0x400>;
clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
@@ -1161,7 +1161,7 @@ dsi_phy0: dsi-phy@1a98300 {
};
};
- mpss: hexagon@4080000 {
+ mpss: remoteproc@4080000 {
compatible = "qcom,msm8916-mss-pil", "qcom,q6v5-pil";
reg = <0x04080000 0x100>,
<0x04020000 0x040>;
@@ -1225,7 +1225,7 @@ cb@1 {
};
};
- pronto: wcnss@a21b000 {
+ pronto: remoteproc@a21b000 {
compatible = "qcom,pronto-v2-pil", "qcom,pronto";
reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
reg-names = "ccu", "dxe", "pmu";
@@ -1821,7 +1821,7 @@ rpm_requests: rpm-requests {
compatible = "qcom,rpm-msm8916";
qcom,smd-channels = "rpm_requests";
- rpmcc: qcom,rpmcc {
+ rpmcc: clock-controller {
compatible = "qcom,rpmcc-msm8916";
#clock-cells = <1>;
};
diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 636ef9db9a14..c7b22ac81452 100644
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -6,7 +6,7 @@
&spmi_bus {
- pm8916_0: pm8916@0 {
+ pm8916_0: pmic@0 {
compatible = "qcom,pm8916", "qcom,spmi-pmic";
reg = <0x0 SPMI_USID>;
#address-cells = <1>;
@@ -79,7 +79,7 @@ pm8916_temp: temp-alarm@2400 {
#thermal-sensor-cells = <0>;
};
- pm8916_vadc: vadc@3100 {
+ pm8916_vadc: adc@3100 {
compatible = "qcom,spmi-vadc";
reg = <0x3100>;
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
@@ -87,33 +87,33 @@ pm8916_vadc: vadc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
- usb_in {
+ adc-chan@0 {
reg = <VADC_USBIN>;
qcom,pre-scaling = <1 10>;
};
- vph_pwr {
+ adc-chan@7 {
reg = <VADC_VSYS>;
qcom,pre-scaling = <1 3>;
};
- die_temp {
+ adc-chan@8 {
reg = <VADC_DIE_TEMP>;
};
- ref_625mv {
+ adc-chan@9 {
reg = <VADC_REF_625MV>;
};
- ref_1250v {
+ adc-chan@a {
reg = <VADC_REF_1250MV>;
};
- ref_gnd {
+ adc-chan@e {
reg = <VADC_GND_REF>;
};
- ref_vdd {
+ adc-chan@f {
reg = <VADC_VDD_VADC>;
};
};
};
- pm8916_1: pm8916@1 {
+ pm8916_1: pmic@1 {
compatible = "qcom,pm8916", "qcom,spmi-pmic";
reg = <0x1 SPMI_USID>;
#address-cells = <1>;
@@ -125,7 +125,7 @@ pm8916_vib: vibrator@c000 {
status = "disabled";
};
- wcd_codec: codec@f000 {
+ wcd_codec: audio-codec@f000 {
compatible = "qcom,pm8916-wcd-analog-codec";
reg = <0xf000>;
reg-names = "pmic-codec-core";
--
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 ` Stephan Gerhold [this message]
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 ` [PATCH 13/14] arm64: dts: qcom: pm8916: " Stephan Gerhold
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-10-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 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.