ARM: tegra: Rename GPU node on Tegra124

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>

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 4ba4d5229fcf1dfb27f381e3218fe299c50574bd..f00ef4d08fd4096d49723b95809f374c2c92febf 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -57,7 +57,7 @@
                };
        };
 
-       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 3760744cc1b001ebb045861729a4154b73b11431..e6d25813b41638811846ba3283d74869ab350b68 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -56,7 +56,7 @@
                };
        };
 
-       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 c3edb332187a2d8cb2b816b3115e5a2af52d56f8..f42191f22c199d5ede4123875b1c4b9b15dba102 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -72,7 +72,7 @@
                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 2d045d1a9bcffaf4f7dfdf1fc168a54f2bf727d9..998b129321f897343f1f345b854eca7fa428f352 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -61,7 +61,7 @@
                };
        };
 
-       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 5f17a2f7d270954d9752b9faea22075a458d99fa..7985d1cbc1c08a6574094fb72963a0b5322cc3fc 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -51,7 +51,7 @@
                };
        };
 
-       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 f4ac0c327c2eb4a1d4948254a7a9d5254f1fbf99..d0ec1a30ff54bcc6a68b52bf628eb969d267e457 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -223,12 +223,7 @@
                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>;