From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Jon Hunter <jonathanh@nvidia.com>, linux-tegra@vger.kernel.org
Subject: [PATCH 09/25] ARM: tegra: Rename GPU node on Tegra124
Date: Thu, 9 Dec 2021 18:33:40 +0100 [thread overview]
Message-ID: <20211209173356.618460-10-thierry.reding@gmail.com> (raw)
In-Reply-To: <20211209173356.618460-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
In order to be able to pass DT schema validation, change the GPU nodes'
unit-address to the standard notation. Previously this was using a "0,"
prefix that originated from a time when the top-level device tree node
contained #address-cells = <2>.
Note that this technically breaks backwards-compatibility with certain
older versions of the U-Boot bootloader because early versions used a
hard-coded DT path lookup to find the GPU node and perform some fixups
on it. However, this was changed to a compatible string based lookup in
April 2016, so it's reasonable to expect people to update U-Boot on the
systems that they want to use this updated kernel DTB with.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +-
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +-
arch/arm/boot/dts/tegra124-nyan.dtsi | 2 +-
arch/arm/boot/dts/tegra124-venice2.dts | 2 +-
arch/arm/boot/dts/tegra124.dtsi | 7 +------
6 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 4ba4d5229fcf..f00ef4d08fd4 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -57,7 +57,7 @@ hdmi@54280000 {
};
};
- gpu@0,57000000 {
+ gpu@57000000 {
/*
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 3760744cc1b0..e6d25813b416 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -56,7 +56,7 @@ hdmi@54280000 {
};
};
- gpu@0,57000000 {
+ gpu@57000000 {
/*
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 95b97c1fa1fb..e056e737abdf 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -72,7 +72,7 @@ cec@70015000 {
status = "okay";
};
- gpu@0,57000000 {
+ gpu@57000000 {
/*
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 1350a0b9a606..b2e7ede8017a 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -61,7 +61,7 @@ dpaux@545c0000 {
};
};
- gpu@0,57000000 {
+ gpu@57000000 {
status = "okay";
vdd-supply = <&vdd_gpu>;
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 4698c6db6f76..0a9aaa7bf066 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -51,7 +51,7 @@ dpaux@545c0000 {
};
};
- gpu@0,57000000 {
+ gpu@57000000 {
/*
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index f4ac0c327c2e..d0ec1a30ff54 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -223,12 +223,7 @@ gic: interrupt-controller@50041000 {
interrupt-parent = <&gic>;
};
- /*
- * Please keep the following 0, notation in place as a former mainline
- * U-Boot version was looking for that particular notation in order to
- * perform required fix-ups on that GPU node.
- */
- gpu@0,57000000 {
+ gpu@57000000 {
compatible = "nvidia,gk20a";
reg = <0x0 0x57000000 0x0 0x01000000>,
<0x0 0x58000000 0x0 0x01000000>;
--
2.34.1
next prev parent reply other threads:[~2021-12-09 17:34 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 17:33 [PATCH 00/25] ARM: tegra: Various cleanups for DT validation Thierry Reding
2021-12-09 17:33 ` [PATCH 01/25] ARM: tegra: Clean up external memory controller nodes Thierry Reding
2021-12-09 20:01 ` Dmitry Osipenko
2021-12-10 12:17 ` Thierry Reding
2021-12-10 15:15 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 02/25] ARM: tegra: Specify correct PMIC compatible on Tegra114 boards Thierry Reding
2021-12-09 17:33 ` [PATCH 03/25] ARM: tegra: Rename SPI flash chip nodes Thierry Reding
2021-12-09 17:33 ` [PATCH 04/25] ARM: tegra: Rename top-level clocks Thierry Reding
2021-12-09 18:27 ` Dmitry Osipenko
2021-12-10 12:53 ` Thierry Reding
2021-12-11 16:45 ` Dmitry Osipenko
2021-12-13 16:02 ` Thierry Reding
2021-12-13 16:52 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 05/25] ARM: tegra: Rename top-level regulators Thierry Reding
2021-12-09 17:33 ` [PATCH 06/25] ARM: tegra: Fix compatible string for Tegra30+ timer Thierry Reding
2021-12-09 19:36 ` Dmitry Osipenko
2021-12-10 13:42 ` Thierry Reding
2021-12-10 15:23 ` Dmitry Osipenko
2021-12-13 16:04 ` Thierry Reding
2021-12-13 16:44 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 07/25] ARM: tegra: Add #reset-cells for Tegra114 MC Thierry Reding
2021-12-09 20:34 ` Dmitry Osipenko
2021-12-10 13:43 ` Thierry Reding
2021-12-10 15:28 ` Dmitry Osipenko
2021-12-13 16:06 ` Thierry Reding
2021-12-13 16:47 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 08/25] ARM: tegra: Rename GPIO hog nodes to match schema Thierry Reding
2021-12-09 17:33 ` Thierry Reding [this message]
2021-12-09 17:33 ` [PATCH 10/25] ARM: tegra: Drop reg-shift for Tegra HS UART Thierry Reding
2021-12-09 19:01 ` Dmitry Osipenko
2021-12-10 13:49 ` Thierry Reding
2021-12-09 17:33 ` [PATCH 11/25] ARM: tegra: Rename thermal zone nodes Thierry Reding
2021-12-09 20:06 ` Dmitry Osipenko
2021-12-10 14:10 ` Thierry Reding
2021-12-10 15:29 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 12/25] ARM: tegra: Do not use unit-address for OPP nodes Thierry Reding
2021-12-09 18:38 ` Dmitry Osipenko
2021-12-10 14:27 ` Thierry Reding
2021-12-10 15:33 ` Dmitry Osipenko
2021-12-10 22:39 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 13/25] ARM: tegra: Fix Tegra124 I2C compatible string list Thierry Reding
2021-12-09 17:33 ` [PATCH 14/25] ARM: tegra: Drop unused AHCI clocks on Tegra124 Thierry Reding
2021-12-09 17:33 ` [PATCH 15/25] ARM: tegra: Sort Tegra124 XUSB clocks correctly Thierry Reding
2021-12-09 17:33 ` [PATCH 16/25] ARM: tegra: Avoid pwm- prefix in pinmux nodes Thierry Reding
2021-12-09 19:13 ` Dmitry Osipenko
2021-12-10 14:38 ` Thierry Reding
2021-12-10 15:38 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 17/25] ARM: tegra: Add compatible string for built-in ASIX on Colibri boards Thierry Reding
2021-12-09 17:33 ` [PATCH 18/25] ARM: tegra: Remove PHY reset GPIO references from USB controller node Thierry Reding
2021-12-09 17:33 ` [PATCH 19/25] ARM: tegra: Add dummy backlight power supplies Thierry Reding
2021-12-09 19:07 ` Dmitry Osipenko
2021-12-10 14:51 ` Thierry Reding
2021-12-09 17:33 ` [PATCH 20/25] ARM: tegra: Use correct vendor prefix for Invensense Thierry Reding
2021-12-09 17:33 ` [PATCH 21/25] ARM: tegra: Remove unsupported properties on Apalis Thierry Reding
2021-12-09 17:33 ` [PATCH 22/25] ARM: tegra: Move I2C clock frequency to bus nodes Thierry Reding
2021-12-09 18:57 ` Dmitry Osipenko
2021-12-10 15:01 ` Thierry Reding
2021-12-10 16:08 ` Dmitry Osipenko
2021-12-13 16:10 ` Thierry Reding
2021-12-13 16:34 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 23/25] ARM: tegra: Remove stray #reset-cells property Thierry Reding
2021-12-09 19:24 ` Dmitry Osipenko
2021-12-10 15:05 ` Thierry Reding
2021-12-10 18:08 ` Dmitry Osipenko
2021-12-13 16:11 ` Thierry Reding
2021-12-13 16:26 ` Dmitry Osipenko
2021-12-13 16:40 ` Dmitry Osipenko
2021-12-09 20:30 ` Dmitry Osipenko
2021-12-09 17:33 ` [PATCH 24/25] ARM: tegra: Fix SLINK compatible string on Tegra30 Thierry Reding
2021-12-09 17:33 ` [PATCH 25/25] ARM: tegra: Fix I2C mux reset GPIO reference on Cardhu 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=20211209173356.618460-10-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linux-tegra@vger.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