arm64: tegra: Add unit-address for CBB on Tegra194

The control back-bone (CBB) starts at physical address 0, so give it a
unit-address to comply with standard naming practices checked for by the
device tree compiler.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
index 02909a48dfcd9df50d9062132c24125a5b1b8226..56c0eb0e5b15bf3503f1ce7b6406b82c029a8d8a 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
@@ -8,17 +8,17 @@
        compatible = "nvidia,p2888", "nvidia,tegra194";
 
        aliases {
-               sdhci0 = "/cbb/sdhci@3460000";
-               sdhci1 = "/cbb/sdhci@3400000";
+               sdhci0 = "/cbb@0/sdhci@3460000";
+               sdhci1 = "/cbb@0/sdhci@3400000";
                serial0 = &tcu;
                i2c0 = "/bpmp/i2c";
-               i2c1 = "/cbb/i2c@3160000";
-               i2c2 = "/cbb/i2c@c240000";
-               i2c3 = "/cbb/i2c@3180000";
-               i2c4 = "/cbb/i2c@3190000";
-               i2c5 = "/cbb/i2c@31c0000";
-               i2c6 = "/cbb/i2c@c250000";
-               i2c7 = "/cbb/i2c@31e0000";
+               i2c1 = "/cbb@0/i2c@3160000";
+               i2c2 = "/cbb@0/i2c@c240000";
+               i2c3 = "/cbb@0/i2c@3180000";
+               i2c4 = "/cbb@0/i2c@3190000";
+               i2c5 = "/cbb@0/i2c@31c0000";
+               i2c6 = "/cbb@0/i2c@c250000";
+               i2c7 = "/cbb@0/i2c@31e0000";
        };
 
        chosen {
@@ -26,7 +26,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       cbb {
+       cbb@0 {
                ethernet@2490000 {
                        status = "okay";
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
index d47cd8c4dd2421f474409821e1ef3df5e68886d9..ae6094a60cc53bf6b7e29142cc87515708d2660a 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
@@ -10,7 +10,7 @@
        model = "NVIDIA Jetson AGX Xavier Developer Kit";
        compatible = "nvidia,p2972-0000", "nvidia,tegra194";
 
-       cbb {
+       cbb@0 {
                aconnect {
                        status = "okay";
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index e02d975fe0822fb245ef72a996107e99dbae8b6b..33743631e983aa7d2d931314f49484db7d54225e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -15,7 +15,7 @@
        #size-cells = <2>;
 
        /* control backbone */
-       cbb {
+       cbb@0 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;