From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/11] arm64: tegra: Fixup SYSRAM references
Date: Fri, 12 Nov 2021 13:35:37 +0100 [thread overview]
Message-ID: <20211112123542.3680629-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20211112123542.3680629-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
The json-schema bindings for SRAM expect the nodes to be called "sram"
rather than "sysram" or "shmem". Furthermore, place the brackets around
the SYSRAM references such that a two-element array is created rather
than a two-element array nested in a single-element array. This is not
relevant for device tree itself, but allows the nodes to be properly
validated against json-schema bindings.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +-
arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +-
arch/arm64/boot/dts/nvidia/tegra234.dtsi | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
index 9ac4f0140700..5f8132884be0 100644
--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
@@ -1771,7 +1771,7 @@ bpmp: bpmp {
iommus = <&smmu TEGRA186_SID_BPMP>;
mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
TEGRA_HSP_DB_MASTER_BPMP>;
- shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
+ shmem = <&cpu_bpmp_tx>, <&cpu_bpmp_rx>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 851e049b3519..8d29b7fdb044 100644
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -2467,7 +2467,7 @@ bpmp: bpmp {
compatible = "nvidia,tegra186-bpmp";
mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
TEGRA_HSP_DB_MASTER_BPMP>;
- shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
+ shmem = <&cpu_bpmp_tx>, <&cpu_bpmp_rx>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
index f0efb3a62804..28961ed31d87 100644
--- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -122,20 +122,20 @@ gic: interrupt-controller@f400000 {
};
};
- sysram@40000000 {
+ sram@40000000 {
compatible = "nvidia,tegra234-sysram", "mmio-sram";
reg = <0x0 0x40000000 0x0 0x50000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0x40000000 0x50000>;
- cpu_bpmp_tx: shmem@4e000 {
+ cpu_bpmp_tx: sram@4e000 {
reg = <0x4e000 0x1000>;
label = "cpu-bpmp-tx";
pool;
};
- cpu_bpmp_rx: shmem@4f000 {
+ cpu_bpmp_rx: sram@4f000 {
reg = <0x4f000 0x1000>;
label = "cpu-bpmp-rx";
pool;
@@ -146,7 +146,7 @@ bpmp: bpmp {
compatible = "nvidia,tegra234-bpmp", "nvidia,tegra186-bpmp";
mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
TEGRA_HSP_DB_MASTER_BPMP>;
- shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
+ shmem = <&cpu_bpmp_tx>, <&cpu_bpmp_rx>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
--
2.33.1
next prev parent reply other threads:[~2021-11-12 12:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 12:35 [PATCH 00/11] arm64: tegra: Add NVIDIA Jetson AGX Orin support Thierry Reding
2021-11-12 12:35 ` [PATCH 01/11] dt-bindings: tegra: Describe recent developer kits consistently Thierry Reding
2021-11-29 20:54 ` Rob Herring
2021-11-12 12:35 ` [PATCH 02/11] dt-bindings: tegra: Document Jetson AGX Orin (and devkit) Thierry Reding
2021-11-29 20:55 ` Rob Herring
2021-11-12 12:35 ` [PATCH 03/11] dt-bindings: Update headers for Tegra234 Thierry Reding
2021-11-29 20:59 ` Rob Herring
2021-11-12 12:35 ` [PATCH 04/11] dt-bindings: sram: Document NVIDIA Tegra SYSRAM Thierry Reding
2021-11-29 20:59 ` Rob Herring
2021-11-12 12:35 ` [PATCH 05/11] misc: sram: Add compatible string for Tegra234 SYSRAM Thierry Reding
2021-12-07 15:52 ` Thierry Reding
2021-12-07 17:45 ` Greg Kroah-Hartman
2021-11-12 12:35 ` Thierry Reding [this message]
2021-11-12 12:35 ` [PATCH 07/11] arm64: tegra: Add clock for Tegra234 RTC Thierry Reding
2021-11-12 12:35 ` [PATCH 08/11] arm64: tegra: Update Tegra234 BPMP channel addresses Thierry Reding
2021-11-12 12:35 ` [PATCH 09/11] arm64: tegra: Fill in properties for Tegra234 eMMC Thierry Reding
2021-11-12 12:35 ` [PATCH 10/11] arm64: tegra: Add Tegra234 TCU device Thierry Reding
2021-11-12 12:35 ` [PATCH 11/11] arm64: tegra: Add NVIDIA Jetson AGX Orin Developer Kit support Thierry Reding
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=20211112123542.3680629-7-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-tegra@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;
as well as URLs for NNTP newsgroup(s).