Commit 48299769 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Thierry Reding

ARM: tegra: Fix unit_address_vs_reg DTC warnings for /memory

Add a generic /memory node in each Tegra DTSI (with empty reg property,
to be overidden by each DTS) and set proper unit address for /memory
nodes to fix the DTC warnings:

    arch/arm/boot/dts/tegra20-harmony.dtb: Warning (unit_address_vs_reg):
        /memory: node has a reg or ranges property, but no unit name

The DTB after the change is the same as before except adding
unit-address to /memory node.
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f48ba1ae
...@@ -23,7 +23,7 @@ chosen { ...@@ -23,7 +23,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
......
...@@ -28,7 +28,7 @@ trusted-foundations { ...@@ -28,7 +28,7 @@ trusted-foundations {
}; };
}; };
memory { memory@80000000 {
/* memory >= 0x79600000 is reserved for firmware usage */ /* memory >= 0x79600000 is reserved for firmware usage */
reg = <0x80000000 0x79600000>; reg = <0x80000000 0x79600000>;
}; };
......
...@@ -28,7 +28,7 @@ trusted-foundations { ...@@ -28,7 +28,7 @@ trusted-foundations {
}; };
}; };
memory { memory@80000000 {
/* memory >= 0x37e00000 is reserved for firmware usage */ /* memory >= 0x37e00000 is reserved for firmware usage */
reg = <0x80000000 0x37e00000>; reg = <0x80000000 0x37e00000>;
}; };
......
...@@ -11,8 +11,9 @@ / { ...@@ -11,8 +11,9 @@ / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x0>;
}; };
host1x@50000000 { host1x@50000000 {
......
...@@ -15,7 +15,7 @@ / { ...@@ -15,7 +15,7 @@ / {
compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1", compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
"nvidia,tegra124"; "nvidia,tegra124";
memory { memory@80000000 {
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
...@@ -50,7 +50,7 @@ / { ...@@ -50,7 +50,7 @@ / {
model = "Toradex Apalis TK1"; model = "Toradex Apalis TK1";
compatible = "toradex,apalis-tk1", "nvidia,tegra124"; compatible = "toradex,apalis-tk1", "nvidia,tegra124";
memory { memory@80000000 {
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
...@@ -24,7 +24,7 @@ chosen { ...@@ -24,7 +24,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
...@@ -13,7 +13,7 @@ chosen { ...@@ -13,7 +13,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
...@@ -18,7 +18,7 @@ chosen { ...@@ -18,7 +18,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
...@@ -13,8 +13,9 @@ / { ...@@ -13,8 +13,9 @@ / {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x0>;
}; };
pcie@1003000 { pcie@1003000 {
......
...@@ -10,7 +10,7 @@ aliases { ...@@ -10,7 +10,7 @@ aliases {
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
}; };
memory { memory@0 {
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
......
...@@ -18,7 +18,7 @@ chosen { ...@@ -18,7 +18,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x40000000>; reg = <0x00000000 0x40000000>;
}; };
......
...@@ -19,7 +19,7 @@ chosen { ...@@ -19,7 +19,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
......
...@@ -18,7 +18,7 @@ chosen { ...@@ -18,7 +18,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x40000000>; reg = <0x00000000 0x40000000>;
}; };
......
...@@ -15,7 +15,7 @@ chosen { ...@@ -15,7 +15,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
......
...@@ -18,7 +18,7 @@ chosen { ...@@ -18,7 +18,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x40000000>; reg = <0x00000000 0x40000000>;
}; };
......
...@@ -18,7 +18,7 @@ chosen { ...@@ -18,7 +18,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@0 {
reg = <0x00000000 0x40000000>; reg = <0x00000000 0x40000000>;
}; };
......
...@@ -11,8 +11,9 @@ / { ...@@ -11,8 +11,9 @@ / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0 0>;
}; };
iram@40000000 { iram@40000000 {
......
...@@ -10,8 +10,8 @@ / { ...@@ -10,8 +10,8 @@ / {
model = "Toradex Apalis T30"; model = "Toradex Apalis T30";
compatible = "toradex,apalis_t30", "nvidia,tegra30"; compatible = "toradex,apalis_t30", "nvidia,tegra30";
memory { memory@80000000 {
reg = <0 0>; reg = <0x80000000 0x40000000>;
}; };
pcie@3000 { pcie@3000 {
......
...@@ -17,7 +17,7 @@ chosen { ...@@ -17,7 +17,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x7ff00000>; reg = <0x80000000 0x7ff00000>;
}; };
......
...@@ -40,7 +40,7 @@ chosen { ...@@ -40,7 +40,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
memory { memory@80000000 {
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
......
...@@ -10,7 +10,7 @@ / { ...@@ -10,7 +10,7 @@ / {
model = "Toradex Colibri T30"; model = "Toradex Colibri T30";
compatible = "toradex,colibri_t30", "nvidia,tegra30"; compatible = "toradex,colibri_t30", "nvidia,tegra30";
memory { memory@80000000 {
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
......
...@@ -11,8 +11,9 @@ / { ...@@ -11,8 +11,9 @@ / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x0>;
}; };
pcie@3000 { pcie@3000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment