Skip to content

Commit

Permalink
ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
Browse files Browse the repository at this point in the history
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: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Gregory CLEMENT authored and Jason Cooper committed Apr 15, 2013
1 parent 467f54b commit 7489836
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/armada-370-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* 370 and Armada XP SoC.
*/

/include/ "skeleton.dtsi"
/include/ "skeleton64.dtsi"

/ {
model = "Marvell Armada 370 and XP SoC";
Expand All @@ -33,7 +33,7 @@
#size-cells = <1>;
compatible = "simple-bus";
interrupt-parent = <&mpic>;
ranges = <0 0xd0000000 0x100000>;
ranges = <0 0 0xd0000000 0x100000>;

internal-regs {
compatible = "simple-bus";
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/armada-370.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

/include/ "armada-370-xp.dtsi"
/include/ "skeleton.dtsi"

/ {
model = "Marvell Armada 370 family SoC";
Expand All @@ -28,6 +29,7 @@
};

soc {
ranges = <0 0xd0000000 0x100000>;
internal-regs {
system-controller@18200 {
compatible = "marvell,armada-370-xp-system-controller";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp-db.dts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

memory {
device_type = "memory";
reg = <0x00000000 0x80000000>; /* 2 GB */
reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
};

soc {
Expand Down
14 changes: 8 additions & 6 deletions arch/arm/boot/dts/armada-xp-gp.dts
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@

memory {
device_type = "memory";

/*
* 4 GB of plug-in RAM modules by default but only 3GB
* are visible, the amount of memory available can be
* changed by the bootloader according the size of the
* module actually plugged
* 8 GB of plug-in RAM modules by default.The amount
* of memory available can be changed by the
* bootloader according the size of the module
* 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 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

memory {
device_type = "memory";
reg = <0x00000000 0xC0000000>; /* 3 GB */
reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */
};

soc {
Expand Down

0 comments on commit 7489836

Please sign in to comment.