提交 74898364 编写于 作者: G Gregory CLEMENT 提交者: Jason Cooper

ARM: dts: mvebu: Convert mvebu device tree files to 64 bits

In order to be able to use more than 4GB of RAM when the LPAE is
activated, the dts must be converted in 64 bits.

Only Armada XP is LPAE capable, but as it shares a common dtsi file
with Armada 370, then the common file include the skeleton64. Thanks
to the use of the overload capability of the device tree format,
armada-370 include the 32 bit skeleton and all the armada 370 based
dts can remain the same.

This was heavily based on the work of Lior Amsalem.
Signed-off-by: NGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: NJason Cooper <jason@lakedaemon.net>
上级 467f54b2
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* 370 and Armada XP SoC. * 370 and Armada XP SoC.
*/ */
/include/ "skeleton.dtsi" /include/ "skeleton64.dtsi"
/ { / {
model = "Marvell Armada 370 and XP SoC"; model = "Marvell Armada 370 and XP SoC";
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#size-cells = <1>; #size-cells = <1>;
compatible = "simple-bus"; compatible = "simple-bus";
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
ranges = <0 0xd0000000 0x100000>; ranges = <0 0 0xd0000000 0x100000>;
internal-regs { internal-regs {
compatible = "simple-bus"; compatible = "simple-bus";
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
/include/ "armada-370-xp.dtsi" /include/ "armada-370-xp.dtsi"
/include/ "skeleton.dtsi"
/ { / {
model = "Marvell Armada 370 family SoC"; model = "Marvell Armada 370 family SoC";
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
}; };
soc { soc {
ranges = <0 0xd0000000 0x100000>;
internal-regs { internal-regs {
system-controller@18200 { system-controller@18200 {
compatible = "marvell,armada-370-xp-system-controller"; compatible = "marvell,armada-370-xp-system-controller";
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x80000000>; /* 2 GB */ reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
}; };
soc { soc {
......
...@@ -26,14 +26,16 @@ ...@@ -26,14 +26,16 @@
memory { memory {
device_type = "memory"; device_type = "memory";
/* /*
* 4 GB of plug-in RAM modules by default but only 3GB * 8 GB of plug-in RAM modules by default.The amount
* are visible, the amount of memory available can be * of memory available can be changed by the
* changed by the bootloader according the size of the * bootloader according the size of the module
* module actually plugged * actually plugged. Only 7GB are usable because
* addresses from 0xC0000000 to 0xffffffff are used by
* the internal registers of the SoC.
*/ */
reg = <0x00000000 0xC0000000>; reg = <0x00000000 0x00000000 0x00000000 0xC0000000>,
<0x00000001 0x00000000 0x00000001 0x00000000>;
}; };
soc { soc {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0xC0000000>; /* 3 GB */ reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */
}; };
soc { soc {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册