From: Stephan Gerhold <stephan@gerhold.net>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephan Gerhold <stephan@gerhold.net>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
~postmarketos/upstreaming@lists.sr.ht
Subject: [PATCH 04/10] arm64: dts: qcom: msm8916: Add more labels
Date: Mon, 20 Jul 2020 10:54:00 +0200 [thread overview]
Message-ID: <20200720085406.6716-5-stephan@gerhold.net> (raw)
In-Reply-To: <20200720085406.6716-1-stephan@gerhold.net>
Add a few more labels to device nodes declared in msm8916.dtsi
so that we can set all needed properties using labels in the
board-specific device tree part.
Also rename the "otg" label to "usb" to allow grouping it with
the USB PHY (usb_hs_phy) node when ordering referenced labels
alphabetically.
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 40 +++++++++++++--------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 8b12961f3269..acbaed23bbdd 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -781,7 +781,7 @@ sdhc_2: sdhci@7864000 {
status = "disabled";
};
- otg: usb@78d9000 {
+ usb: usb@78d9000 {
compatible = "qcom,ci-hdrc";
reg = <0x78d9000 0x200>,
<0x78d9200 0x200>;
@@ -809,7 +809,7 @@ usb_hs_phy: phy {
#phy-cells = <0>;
clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
clock-names = "ref", "sleep";
- resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>;
+ resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
reset-names = "phy", "por";
qcom,init-seq = /bits/ 8 <0x0 0x44
0x1 0x6b 0x2 0x24 0x3 0x13>;
@@ -1151,7 +1151,7 @@ dsi_phy0: dsi-phy@1a98300 {
};
- hexagon@4080000 {
+ mpss: hexagon@4080000 {
compatible = "qcom,q6v5-pil";
reg = <0x04080000 0x100>,
<0x04020000 0x040>;
@@ -1289,7 +1289,7 @@ wifi {
};
};
- tpiu@820000 {
+ tpiu: tpiu@820000 {
compatible = "arm,coresight-tpiu", "arm,primecell";
reg = <0x820000 0x1000>;
@@ -1307,7 +1307,7 @@ tpiu_in: endpoint {
};
};
- funnel@821000 {
+ funnel0: funnel@821000 {
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
reg = <0x821000 0x1000>;
@@ -1348,7 +1348,7 @@ funnel0_out: endpoint {
};
};
- replicator@824000 {
+ replicator: replicator@824000 {
compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
reg = <0x824000 0x1000>;
@@ -1384,7 +1384,7 @@ replicator_in: endpoint {
};
};
- etf@825000 {
+ etf: etf@825000 {
compatible = "arm,coresight-tmc", "arm,primecell";
reg = <0x825000 0x1000>;
@@ -1410,7 +1410,7 @@ etf_out: endpoint {
};
};
- etr@826000 {
+ etr: etr@826000 {
compatible = "arm,coresight-tmc", "arm,primecell";
reg = <0x826000 0x1000>;
@@ -1428,7 +1428,7 @@ etr_in: endpoint {
};
};
- funnel@841000 { /* APSS funnel only 4 inputs are used */
+ funnel1: funnel@841000 { /* APSS funnel only 4 inputs are used */
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
reg = <0x841000 0x1000>;
@@ -1476,7 +1476,7 @@ funnel1_out: endpoint {
};
};
- debug@850000 {
+ debug0: debug@850000 {
compatible = "arm,coresight-cpu-debug","arm,primecell";
reg = <0x850000 0x1000>;
clocks = <&rpmcc RPM_QDSS_CLK>;
@@ -1485,7 +1485,7 @@ debug@850000 {
status = "disabled";
};
- debug@852000 {
+ debug1: debug@852000 {
compatible = "arm,coresight-cpu-debug","arm,primecell";
reg = <0x852000 0x1000>;
clocks = <&rpmcc RPM_QDSS_CLK>;
@@ -1494,7 +1494,7 @@ debug@852000 {
status = "disabled";
};
- debug@854000 {
+ debug2: debug@854000 {
compatible = "arm,coresight-cpu-debug","arm,primecell";
reg = <0x854000 0x1000>;
clocks = <&rpmcc RPM_QDSS_CLK>;
@@ -1503,7 +1503,7 @@ debug@854000 {
status = "disabled";
};
- debug@856000 {
+ debug3: debug@856000 {
compatible = "arm,coresight-cpu-debug","arm,primecell";
reg = <0x856000 0x1000>;
clocks = <&rpmcc RPM_QDSS_CLK>;
@@ -1598,7 +1598,7 @@ etm3_out: endpoint {
/* System CTIs */
/* CTI 0 - TMC connections */
- cti@810000 {
+ cti0: cti@810000 {
compatible = "arm,coresight-cti", "arm,primecell";
reg = <0x810000 0x1000>;
@@ -1609,7 +1609,7 @@ cti@810000 {
};
/* CTI 1 - TPIU connections */
- cti@811000 {
+ cti1: cti@811000 {
compatible = "arm,coresight-cti", "arm,primecell";
reg = <0x811000 0x1000>;
@@ -1623,7 +1623,7 @@ cti@811000 {
/* Core CTIs; CTIs 12-15 */
/* CTI - CPU-0 */
- cti@858000 {
+ cti12: cti@858000 {
compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
"arm,primecell";
reg = <0x858000 0x1000>;
@@ -1638,7 +1638,7 @@ cti@858000 {
};
/* CTI - CPU-1 */
- cti@859000 {
+ cti13: cti@859000 {
compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
"arm,primecell";
reg = <0x859000 0x1000>;
@@ -1653,7 +1653,7 @@ cti@859000 {
};
/* CTI - CPU-2 */
- cti@85a000 {
+ cti14: cti@85a000 {
compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
"arm,primecell";
reg = <0x85a000 0x1000>;
@@ -1668,7 +1668,7 @@ cti@85a000 {
};
/* CTI - CPU-3 */
- cti@85b000 {
+ cti15: cti@85b000 {
compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
"arm,primecell";
reg = <0x85b000 0x1000>;
@@ -1821,7 +1821,7 @@ rpm {
qcom,ipc = <&apcs 8 0>;
qcom,smd-edge = <15>;
- rpm-requests {
+ rpm_requests: rpm-requests {
compatible = "qcom,rpm-msm8916";
qcom,smd-channels = "rpm_requests";
--
2.27.0
next prev parent reply other threads:[~2020-07-20 8:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 8:53 [PATCH 00/10] Convert MSM8916 boards to use labels, reduce duplication Stephan Gerhold
2020-07-20 8:53 ` [PATCH 01/10] arm64: dts: qcom: apq8016-sbc: Remove properties that are already default Stephan Gerhold
2020-07-20 8:53 ` [PATCH 02/10] arm64: dts: qcom: msm8916: Declare sound node in msm8916.dtsi Stephan Gerhold
2020-07-20 8:53 ` [PATCH 03/10] arm64: dts: qcom: apq8016-sbc: Define leds outside of soc node Stephan Gerhold
2020-07-20 8:54 ` Stephan Gerhold [this message]
2020-07-20 8:54 ` [PATCH 05/10] arm64: dts: qcom: msm8916: Use labels in board device trees Stephan Gerhold
2020-07-20 8:54 ` [PATCH 06/10] arm64: dts: qcom: pm8916: Add resin node Stephan Gerhold
2020-07-20 8:54 ` [PATCH 07/10] arm64: dts: qcom: msm8916: Move PM8916-specific parts to msm8916-pm8916.dtsi Stephan Gerhold
2020-07-20 8:54 ` [PATCH 08/10] arm64: dts: qcom: msm8916: Move more supplies " Stephan Gerhold
2020-07-20 8:54 ` [PATCH 09/10] arm64: dts: qcom: msm8916: Set default pinctrl for blsp1_uart1/2 Stephan Gerhold
2020-07-20 8:54 ` [PATCH 10/10] arm64: dts: qcom: msm8916: Move common USB properties to msm8916.dtsi Stephan Gerhold
2020-09-14 9:43 ` [PATCH 00/10] Convert MSM8916 boards to use labels, reduce duplication Stephan Gerhold
2020-09-15 4:56 ` Bjorn Andersson
2020-09-15 7:16 ` Stephan Gerhold
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=20200720085406.6716-5-stephan@gerhold.net \
--to=stephan@gerhold.net \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=srinivas.kandagatla@linaro.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.