Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / tegra124-nyan-blaze-emc.dtsi

diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi b/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
index 9ecd108f56cf3b348bda5688aefa7232efe982d7..c7c31d4c1a2b73cd4abe1ce4dab508760afa46ab 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
-       clock@0,60006000 {
+       clock@60006000 {
                emc-timings-1 {
                        nvidia,ram-code = <1>;
 
@@ -67,7 +68,7 @@
                };
        };
 
-       emc@0,7001b000 {
+       emc@7001b000 {
                emc-timings-1 {
                        nvidia,ram-code = <1>;
 
@@ -1754,7 +1755,7 @@
                };
        };
 
-       memory-controller@0,70019000 {
+       memory-controller@70019000 {
                emc-timings-1 {
                        nvidia,ram-code = <1>;