ARM: mvebu: Enable LPAE support for Armada XP SoCs
Subsystems (4)
v3 cover ARM: mvebu: Enable LPAE support for Armada XP SoCs
Hello,
The Armada XP SoCs have LPAE support. This is the third patch set which allows to run kernel on this SoCs with LPAE support.
The biggest changes are the conversion of the device tree file to 64 bits in order to be able to use more than 4GB of memory (without this the LPAE is pointless).
They are two kinds of change:
- most of the change are on the commit log, according to Arnd comments.
- the other change was made on the patch "ARM: dts: mvebu: Convert mvebu device tree files to 64 bits". I managed to not have to use the 64 bits format for the Armada 370 device tree files.
This patch set won't be the last one, as to ease the merge work of Jason, I will rebase this series onto his dts branch once he will have pull the pending commits. Beside this rebase nothing will be changed, that why I would like to start to get the acked-by from Rob Herring and Arnd Bergmann for this series(both of them made comments so they must have an opinion on this last version). I am also submitting the patch "ARM: mvebu: Enable pj4b on LPAE compilations" to Russell King's patch system as I didn't receive any complaint about it, and it is a pretty trivial patch.
This new patch set have been tested on a Armada XP GP board with 8GB of DRAM with LPAE selected. It have been tested on Armada XP DB board with 3GB of DRAM with and without LPAE. And also on the Armada 370 DB board (without LPAE) to check that no regression appeared.
This patch set is based on 3.9-rc6 and is still 3.10 material. The git branch called lpae-v3 is available at:
https://github.com/MISL-EBU-System-SW/mainline-public.git.
Thanks,
Changelog:
v2 -> v3:
* Pass all the arm architecture word in uppercase in the commit titles.
* Add a commit message to "ARM: dts: mvebu: move all peripherals inside soc" and move it at first patch of the series.
* Add a commit message to " ARM: dts: mvebu: move all peripherals inside soc"
* Add a commit message to "ARM: dts: mvebu: introduce internal-regs node"
* Add more explanation to "ARM: mvebu: Align the internal registers virtual base to support LPAE"
* In patch "ARM: dts: mvebu: Convert all the mvebu files to use the range property" thanks to the use of the overload capability of the device tree format, armada-370 now includes the 32 bit skeleton and all the armada 370 based dts can remain the same.
v1 -> v2:
* The patch to convert the mvebu device tree files to 64 bits was split in 3 parts:
- "arm: dts: move all peripherals inside soc" from Thomas
- then "arm: dts: Convert all the mvebu files to use the range
property" which will allow to keep 32 bits addresses for the internal registers whereas the memory of the system will be 64 bits
- and finally "arm: dts: Convert mvebu device tree files to 64
bits" which was the move to 64 bits itself.
* A new patch was added "arm: dts: introduce internal-regs node" based on the work of Thomas for the mvebu-mbus driver. It introduce a 'internal-regs' subnode, under which all devices are moved. This is not really needed for now, but will be for the mvebu-mbus driver. This generates a lot of code movement since it's indenting by one more tab all the devices. So it was a good opportunity to fix all the bad indentation.
* New patch from Thomas "fix cpus section indentation" to finalize the fixing of the bad indentation
* For DMA transfer, DMA_ZONE was selected instead of DMABOUNCE: all the DMA transfer are restricted to the low 32 bits address space.
Gregory CLEMENT (4):
ARM: mvebu: Limit the DMA zone when LPAE is selected
ARM: dts: mvebu: Convert all the mvebu files to use the range
property
ARM: dts: mvebu: introduce internal-regs node
ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
Lior Amsalem (3):
ARM: mvebu: Align the internal registers virtual base to support LPAE
ARM: mvebu: Enable pj4b on LPAE compilations
ARM: dts: Add a 64 bits version of the skeleton device tree
Thomas Petazzoni (2):
ARM: dts: mvebu: fix cpus section indentation
ARM: dts: mvebu: move all peripherals inside soc
arch/arm/boot/dts/armada-370-db.dts | 108 ++++----- arch/arm/boot/dts/armada-370-mirabox.dts | 78 +++---- arch/arm/boot/dts/armada-370-rd.dts | 16 +- arch/arm/boot/dts/armada-370-xp.dtsi | 253 +++++++++++----------- arch/arm/boot/dts/armada-370.dtsi | 223 +++++++++---------- arch/arm/boot/dts/armada-xp-db.dts | 156 ++++++------- arch/arm/boot/dts/armada-xp-gp.dts | 138 ++++++------ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 84 +++---- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 110 +++++----- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 136 ++++++------ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 198 ++++++++--------- arch/arm/boot/dts/armada-xp.dtsi | 191 ++++++++-------- arch/arm/boot/dts/skeleton64.dtsi | 13 ++ arch/arm/include/debug/mvebu.S | 2 +- arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/armada-370-xp.h | 2 +- arch/arm/mm/proc-v7.S | 3 +- 17 files changed, 877 insertions(+), 835 deletions(-) create mode 100644 arch/arm/boot/dts/skeleton64.dtsi
Signature · 1 line
1.7.9.5
PATCH v3 1/9 ARM: dts: mvebu: fix cpus section indentation
From: Thomas Petazzoni <[email protected]>
Align the cpu node indentation with the rest of the file
[gc]: added a commit description
--- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 28 ++++++++-------- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 28 ++++++++-------- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 54 +++++++++++++++--------------- 3 files changed, 55 insertions(+), 55 deletions(-)
arch/arm/boot/dts/armada-xp-mv78230.dtsi +14 -14
@@ -25,22 +25,22 @@ }; cpus { - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - cpu at 0 { - device_type = "cpu"; - compatible = "marvell,sheeva-v7"; - reg = <0>; - clocks = <&cpuclk 0>; - }; + cpu at 0 { + device_type = "cpu"; + compatible = "marvell,sheeva-v7"; + reg = <0>; + clocks = <&cpuclk 0>; + }; - cpu at 1 { - device_type = "cpu"; - compatible = "marvell,sheeva-v7"; - reg = <1>; - clocks = <&cpuclk 1>; - }; + cpu at 1 { + device_type = "cpu"; + compatible = "marvell,sheeva-v7"; + reg = <1>; + clocks = <&cpuclk 1>; + }; }; soc {
arch/arm/boot/dts/armada-xp-mv78260.dtsi +14 -14
@@ -26,22 +26,22 @@ }; cpus { - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - cpu at 0 { - device_type = "cpu"; - compatible = "marvell,sheeva-v7"; - reg = <0>; - clocks = <&cpuclk 0>; - }; + cpu at 0 { + device_type = "cpu"; + compatible = "marvell,sheeva-v7"; + reg = <0>; + clocks = <&cpuclk 0>; + }; - cpu at 1 { - device_type = "cpu"; - compatible = "marvell,sheeva-v7"; - reg = <1>; - clocks = <&cpuclk 1>; - }; + cpu at 1 { + device_type = "cpu"; + compatible = "marvell,sheeva-v7"; + reg = <1>; + clocks = <&cpuclk 1>; + }; }; soc {
arch/arm/boot/dts/armada-xp-mv78460.dtsi +27 -27
67 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v3 2/9 ARM: mvebu: Limit the DMA zone when LPAE is selected
In reply to Gregory CLEMENTWhen LPAE is activated on Armada XP, all registers and IOs are still 32bit, the 40bit extension is on the CPU to DRAM path (windows) only. That means that all the DMA transfer are restricted to the low 32 bits address space. This is limitation is achieved by selecting ZONE_DMA.
--- arch/arm/mach-mvebu/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-mvebu/Kconfig +1 -0
@@ -13,6 +13,7 @@ config ARCH_MVEBU select MVEBU_CLK_CORE select MVEBU_CLK_CPU select MVEBU_CLK_GATING + select ZONE_DMA if ARM_LPAE if ARCH_MVEBU
Signature · 1 line
1.7.9.5
Jason Cooper
AppliedRe: [PATCH v3 2/9] ARM: mvebu: Limit the DMA zone when LPAE is selected
Quoted 9 lines · Gregory CLEMENT
When LPAE is activated on Armada XP, all registers and IOs are still 32bit, the 40bit extension is on the CPU to DRAM path (windows) only. That means that all the DMA transfer are restricted to the low 32 bits address space. This is limitation is achieved by selecting
ZONE_DMA.Signed-off-by Gregory CLEMENT <[email protected]>--- arch/arm/mach-mvebu/Kconfig | 1 + 1 file changed, 1 insertion(+)
Applied to mvebu/soc
thx,
Jason.
PATCH v3 3/9 ARM: mvebu: Align the internal registers virtual base to support LPAE
In reply to Gregory CLEMENTFrom: Lior Amsalem <[email protected]>
In order to be able to support the LPAE, the internal registers virtual base must be aligned to 2MB. In LPAE section size is 2MB, in earlyprintk we map the internal registers and it must be section aligned.
--- arch/arm/include/debug/mvebu.S | 2 +- arch/arm/mach-mvebu/armada-370-xp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/include/debug/mvebu.S +1 -1
@@ -12,7 +12,7 @@ */ #define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 -#define ARMADA_370_XP_REGS_VIRT_BASE 0xfeb00000 +#define ARMADA_370_XP_REGS_VIRT_BASE 0xfec00000 .macro addruart, rp, rv, tmp ldr \rp, =ARMADA_370_XP_REGS_PHYS_BASE
arch/arm/mach-mvebu/armada-370-xp.h +1 -1
@@ -16,7 +16,7 @@#define __MACH_ARMADA_370_XP_H#define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 -#define ARMADA_370_XP_REGS_VIRT_BASE IOMEM(0xfeb00000) +#define ARMADA_370_XP_REGS_VIRT_BASE IOMEM(0xfec00000)#define ARMADA_370_XP_REGS_SIZE SZ_1M#ifdef CONFIG_SMP
Signature · 1 line
1.7.9.5
Jason Cooper
AppliedRe: [PATCH v3 3/9] ARM: mvebu: Align the internal registers virtual base to support LPAE
Quoted 7 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
In order to be able to support the LPAE, the internal registers virtual base must be aligned to 2MB. In LPAE section size is 2MB, in earlyprintk we map the internal registers and it must be section aligned.
Quoted 6 lines
Signed-off-by Lior Amsalem <[email protected]>Signed-off-by Gregory CLEMENT <[email protected]>--- arch/arm/include/debug/mvebu.S | 2 +- arch/arm/mach-mvebu/armada-370-xp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to mvebu/soc
thx,
Jason.
PATCH v3 4/9 ARM: mvebu: Enable pj4b on LPAE compilations
In reply to Gregory CLEMENTFrom: Lior Amsalem <[email protected]>
pj4b cpus are LPAE capable so enable them on LPAE compilations
--- arch/arm/mm/proc-v7.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mm/proc-v7.S +2 -1
@@ -402,6 +402,8 @@ __v7_ca9mp_proc_info: __v7_proc __v7_ca9mp_setup .size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info +#endif /* CONFIG_ARM_LPAE */ + /* * Marvell PJ4B processor. */
@@ -411,7 +413,6 @@ __v7_pj4b_proc_info: .long 0xfffffff0 __v7_proc __v7_pj4b_setup .size __v7_pj4b_proc_info, . - __v7_pj4b_proc_info -#endif /* CONFIG_ARM_LPAE */ /* * ARM Ltd. Cortex A7 processor.
Signature · 1 line
1.7.9.5
Jason Cooper
AppliedRe: [PATCH v3 4/9] ARM: mvebu: Enable pj4b on LPAE compilations
Quoted 10 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
pj4b cpus are LPAE capable so enable them on LPAE compilations
Signed-off-by Lior Amsalem <[email protected]>Tested-by Franklin <[email protected]>Signed-off-by Gregory CLEMENT <[email protected]>--- arch/arm/mm/proc-v7.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to mvebu/soc
thx,
Jason.
Re: [PATCH v3 4/9] ARM: mvebu: Enable pj4b on LPAE compilations
Hi Jason,
Quoted 12 lines · Jason Cooper
Quoted 10 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
pj4b cpus are LPAE capable so enable them on LPAE compilations
Signed-off-by Lior Amsalem <[email protected]>Tested-by Franklin <[email protected]>Signed-off-by Gregory CLEMENT <[email protected]>--- arch/arm/mm/proc-v7.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 6 lines
Applied to mvebu/soc
thx,
Jason.
First thanks for pulling all these patches.
However, this one should go through Russell's git tree. Or at least you need his acked-by. I have already submit this patch on Russell patch system. Unfortunately Russell told that he will be away for around one week.
This patch is needed to have LPAE support, but all the other patches don't depend on it. That means that if you applied all the other patches it won't break anything even if at the end this patch is not merged. But I really hope that Russell will be able to apply this patch to his git tree.
Thanks
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Re: [PATCH v3 4/9] ARM: mvebu: Enable pj4b on LPAE compilations
Quoted 17 lines · Gregory CLEMENT
Hi Jason,
Quoted 14 lines · Jason Cooper
Quoted 10 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
pj4b cpus are LPAE capable so enable them on LPAE compilations
Signed-off-by Lior Amsalem <[email protected]>Tested-by Franklin <[email protected]>Signed-off-by Gregory CLEMENT <[email protected]>--- arch/arm/mm/proc-v7.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Applied to mvebu/soc
...
Quoted 11 lines
However, this one should go through Russell's git tree. Or at least you need his acked-by. I have already submit this patch on Russell patch system. Unfortunately Russell told that he will be away for around one week.
This patch is needed to have LPAE support, but all the other patches don't depend on it. That means that if you applied all the other patches it won't break anything even if at the end this patch is not merged. But I really hope that Russell will be able to apply this patch to his git tree.
ok, thanks for catching this before I sent the PR. I'll drop it.
thx,
Jason.
PATCH v3 5/9 ARM: dts: Add a 64 bits version of the skeleton device tree
In reply to Gregory CLEMENTFrom: Lior Amsalem <[email protected]>
In order to be able to use more than 4GB address-cells and size-cells have to be set to 2
--- arch/arm/boot/dts/skeleton64.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/arm/boot/dts/skeleton64.dtsi
arch/arm/boot/dts/skeleton64.dtsi new file +13 -0
@@ -0,0 +1,13 @@ +/* + * Skeleton device tree in the 64 bits version; the bare minimum + * needed to boot; just include and add a compatible value. The + * bootloader will typically populate the memory node. + */ + +/ { + #address-cells = <2>; + #size-cells = <2>; + chosen { }; + aliases { }; + memory { device_type = "memory"; reg = <0 0>; }; +};
Signature · 1 line
1.7.9.5
Jason Cooper
AppliedRe: [PATCH v3 5/9] ARM: dts: Add a 64 bits version of the skeleton device tree
Quoted 11 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
In order to be able to use more than 4GB address-cells and size-cells have to be set to 2
Signed-off-by Gregory CLEMENT <[email protected]>Signed-off-by Lior Amsalem <[email protected]>--- arch/arm/boot/dts/skeleton64.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/arm/boot/dts/skeleton64.dtsi
Applied to mvebu/dt
Gregory,
Once I can pull in Thomas' pci work, you'll just need to rebase patches 1, and 6 - 9 against mvebu/dt.
thx,
Jason.
Re: [PATCH v3 5/9] ARM: dts: Add a 64 bits version of the skeleton device tree
Hi Jason,
Quoted 13 lines · Jason Cooper
Quoted 11 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
In order to be able to use more than 4GB address-cells and size-cells have to be set to 2
Signed-off-by Gregory CLEMENT <[email protected]>Signed-off-by Lior Amsalem <[email protected]>--- arch/arm/boot/dts/skeleton64.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/arm/boot/dts/skeleton64.dtsi
Quoted 7 lines
Applied to mvebu/dt
Gregory,
Once I can pull in Thomas' pci work, you'll just need to rebase patches 1, and 6 - 9 against mvebu/dt.
Yes sure! When did you plan to pull the dts part of Thomas' pci work? Is there still anything left to prevent to pull this part?
Thanks,
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Re: [PATCH v3 5/9] ARM: dts: Add a 64 bits version of the skeleton device tree
Quoted 18 lines · Gregory CLEMENT
Hi Jason,
Quoted 15 lines · Jason Cooper
Quoted 11 lines · Gregory CLEMENT
From: Lior Amsalem <[email protected]>
In order to be able to use more than 4GB address-cells and size-cells have to be set to 2
Signed-off-by Gregory CLEMENT <[email protected]>Signed-off-by Lior Amsalem <[email protected]>--- arch/arm/boot/dts/skeleton64.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/arm/boot/dts/skeleton64.dtsiApplied to mvebu/dt
Quoted 8 lines
Quoted 5 lines
Gregory,
Once I can pull in Thomas' pci work, you'll just need to rebase patches 1, and 6 - 9 against mvebu/dt.
Yes sure! When did you plan to pull the dts part of Thomas' pci work? Is there still anything left to prevent to pull this part?
Good call, I'm just waiting for the last Ack Thomas said he needs on the first of/pci patch. My head has been fuzzy with hay fever for the past three days. Obviously, I can pull in the dts portion.
thx,
Jason.
PATCH v3 6/9 ARM: dts: mvebu: move all peripherals inside soc
In reply to Gregory CLEMENTFrom: Thomas Petazzoni <[email protected]>
reorganize the .dts and .dtsi files so that all devices are under the soc { } node (currently some devices such as the interrupt controller, the L2 cache and a few others are outside).
--- arch/arm/boot/dts/armada-370-xp.dtsi | 26 +++++++++++++------------- arch/arm/boot/dts/armada-370.dtsi | 23 ++++++++++++----------- arch/arm/boot/dts/armada-xp.dtsi | 32 ++++++++++++++++---------------- 3 files changed, 41 insertions(+), 40 deletions(-)
arch/arm/boot/dts/armada-370-xp.dtsi +13 -13
@@ -28,19 +28,6 @@ }; }; - mpic: interrupt-controller at d0020000 { - compatible = "marvell,mpic"; - #interrupt-cells = <1>; - #size-cells = <1>; - interrupt-controller; - }; - - coherency-fabric at d0020200 { - compatible = "marvell,coherency-fabric"; - reg = <0xd0020200 0xb0>, - <0xd0021810 0x1c>; - }; - soc { #address-cells = <1>; #size-cells = <1>;
@@ -48,6 +35,19 @@ interrupt-parent = <&mpic>; ranges; + mpic: interrupt-controller at d0020000 { + compatible = "marvell,mpic"; + #interrupt-cells = <1>; + #size-cells = <1>; + interrupt-controller; + }; + + coherency-fabric at d0020200 { + compatible = "marvell,coherency-fabric"; + reg = <0xd0020200 0xb0>, + <0xd0021810 0x1c>; + }; + serial at d0012000 { compatible = "snps,dw-apb-uart"; reg = <0xd0012000 0x100>;
arch/arm/boot/dts/armada-370.dtsi +12 -11
@@ -20,12 +20,6 @@ / { model = "Marvell Armada 370 family SoC"; compatible = "marvell,armada370", "marvell,armada-370-xp"; - L2: l2-cache { - compatible = "marvell,aurora-outer-cache"; - reg = <0xd0008000 0x1000>; - cache-id-part = <0x100>; - wt-override; - }; aliases { gpio0 = &gpio0;
@@ -33,17 +27,24 @@ gpio2 = &gpio2; }; - mpic: interrupt-controller at d0020000 { - reg = <0xd0020a00 0x1d0>, - <0xd0021870 0x58>; - }; - soc { + mpic: interrupt-controller at d0020000 { + reg = <0xd0020a00 0x1d0>, + <0xd0021870 0x58>; + }; + system-controller at d0018200 { compatible = "marvell,armada-370-xp-system-controller"; reg = <0xd0018200 0x100>; }; + L2: l2-cache { + compatible = "marvell,aurora-outer-cache"; + reg = <0xd0008000 0x1000>; + cache-id-part = <0x100>; + wt-override; + }; + pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0xd0018000 0x38>;
arch/arm/boot/dts/armada-xp.dtsi +16 -16
@@ -22,25 +22,25 @@ model = "Marvell Armada XP family SoC"; compatible = "marvell,armadaxp", "marvell,armada-370-xp"; - L2: l2-cache { - compatible = "marvell,aurora-system-cache"; - reg = <0xd0008000 0x1000>; - cache-id-part = <0x100>; - wt-override; - }; + soc { + L2: l2-cache { + compatible = "marvell,aurora-system-cache"; + reg = <0xd0008000 0x1000>; + cache-id-part = <0x100>; + wt-override; + }; - mpic: interrupt-controller at d0020000 { - reg = <0xd0020a00 0x2d0>, - <0xd0021070 0x58>; - }; + mpic: interrupt-controller at d0020000 { + reg = <0xd0020a00 0x2d0>, + <0xd0021070 0x58>; + }; - armada-370-xp-pmsu at d0022000 { - compatible = "marvell,armada-370-xp-pmsu"; - reg = <0xd0022100 0x430>, - <0xd0020800 0x20>; - }; + armada-370-xp-pmsu at d0022000 { + compatible = "marvell,armada-370-xp-pmsu"; + reg = <0xd0022100 0x430>, + <0xd0020800 0x20>; + }; - soc { serial at d0012200 { compatible = "snps,dw-apb-uart"; reg = <0xd0012200 0x100>;
Signature · 1 line
1.7.9.5
PATCH v3 7/9 ARM: dts: mvebu: Convert all the mvebu files to use the range property
In reply to Gregory CLEMENTThis conversion will allow to keep 32 bits addresses for the internal registers whereas the memory of the system will be 64 bits. Later it will also ease the move of the mvebu-mbus driver to the device tree support.
--- arch/arm/boot/dts/armada-370-db.dts | 16 ++--- arch/arm/boot/dts/armada-370-mirabox.dts | 14 ++-- arch/arm/boot/dts/armada-370-rd.dts | 14 ++-- arch/arm/boot/dts/armada-370-xp.dtsi | 83 +++++++++++----------- arch/arm/boot/dts/armada-370.dtsi | 49 ++++++------- arch/arm/boot/dts/armada-xp-db.dts | 28 ++++---- arch/arm/boot/dts/armada-xp-gp.dts | 20 +++--- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 +-- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 18 ++--- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 18 ++--- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 22 +++--- arch/arm/boot/dts/armada-xp.dtsi | 65 ++++++++--------- 12 files changed, 180 insertions(+), 177 deletions(-)
arch/arm/boot/dts/armada-370-db.dts +8 -8
@@ -30,11 +30,11 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <200000000>; status = "okay"; }; - sata at d00a0000 { + sata at a0000 { nr-ports = <2>; status = "okay"; };
@@ -49,18 +49,18 @@ }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "rgmii-id"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "rgmii-id"; }; - mvsdio at d00d4000 { + mvsdio at d4000 { pinctrl-0 = <&sdio_pins1>; pinctrl-names = "default"; /*
@@ -75,15 +75,15 @@ /* No CD or WP GPIOs */ }; - usb at d0050000 { + usb at 50000 { status = "okay"; }; - usb at d0051000 { + usb at 51000 { status = "okay"; }; - spi0: spi at d0010600 { + spi0: spi at 10600 { status = "okay"; spi-flash at 0 {
arch/arm/boot/dts/armada-370-mirabox.dts +7 -7
@@ -25,11 +25,11 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <200000000>; status = "okay"; }; - timer at d0020300 { + timer at 20300 { clock-frequency = <600000000>; status = "okay"; };
@@ -42,18 +42,18 @@ reg = <1>; }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "rgmii-id"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "rgmii-id"; }; - mvsdio at d00d4000 { + mvsdio at d4000 { pinctrl-0 = <&sdio_pins3>; pinctrl-names = "default"; status = "okay";
@@ -63,11 +63,11 @@ */ }; - usb at d0050000 { + usb at 50000 { status = "okay"; }; - usb at d0051000 { + usb at 51000 { status = "okay"; }; };
arch/arm/boot/dts/armada-370-rd.dts +7 -7
@@ -28,11 +28,11 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <200000000>; status = "okay"; }; - sata at d00a0000 { + sata at a0000 { nr-ports = <2>; status = "okay"; };
@@ -47,29 +47,29 @@ }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "sgmii"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "rgmii-id"; }; - mvsdio at d00d4000 { + mvsdio at d4000 { pinctrl-0 = <&sdio_pins1>; pinctrl-names = "default"; status = "okay"; /* No CD or WP GPIOs */ }; - usb at d0050000 { + usb at 50000 { status = "okay"; }; - usb at d0051000 { + usb at 51000 { status = "okay"; }; };
arch/arm/boot/dts/armada-370-xp.dtsi +42 -41
182 lines not on this page · raw message
arch/arm/boot/dts/armada-370.dtsi +25 -24
117 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-db.dts +14 -14
@@ -30,24 +30,24 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012100 { + serial at 12100 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012200 { + serial at 12200 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012300 { + serial at 12300 { clock-frequency = <250000000>; status = "okay"; }; - sata at d00a0000 { + sata at a0000 { nr-ports = <2>; status = "okay"; };
@@ -70,47 +70,47 @@ }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "rgmii-id"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "rgmii-id"; }; - ethernet at d0030000 { + ethernet at 30000 { status = "okay"; phy = <&phy2>; phy-mode = "sgmii"; }; - ethernet at d0034000 { + ethernet at 34000 { status = "okay"; phy = <&phy3>; phy-mode = "sgmii"; }; - mvsdio at d00d4000 { + mvsdio at d4000 { pinctrl-0 = <&sdio_pins>; pinctrl-names = "default"; status = "okay"; /* No CD or WP GPIOs */ }; - usb at d0050000 { + usb at 50000 { status = "okay"; }; - usb at d0051000 { + usb at 51000 { status = "okay"; }; - usb at d0052000 { + usb at 52000 { status = "okay"; }; - spi0: spi at d0010600 { + spi0: spi at 10600 { status = "okay"; spi-flash at 0 {
arch/arm/boot/dts/armada-xp-gp.dts +10 -10
@@ -37,24 +37,24 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012100 { + serial at 12100 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012200 { + serial at 12200 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012300 { + serial at 12300 { clock-frequency = <250000000>; status = "okay"; }; - sata at d00a0000 { + sata at a0000 { nr-ports = <2>; status = "okay"; };
@@ -77,28 +77,28 @@ }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "rgmii-id"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "rgmii-id"; }; - ethernet at d0030000 { + ethernet at 30000 { status = "okay"; phy = <&phy2>; phy-mode = "rgmii-id"; }; - ethernet at d0034000 { + ethernet at 34000 { status = "okay"; phy = <&phy3>; phy-mode = "rgmii-id"; }; - spi0: spi at d0010600 { + spi0: spi at 10600 { status = "okay"; spi-flash at 0 {
arch/arm/boot/dts/armada-xp-mv78230.dtsi +5 -5
@@ -46,7 +46,7 @@ soc { pinctrl { compatible = "marvell,mv78230-pinctrl"; - reg = <0xd0018000 0x38>; + reg = <0x18000 0x38>; sdio_pins: sdio-pins { marvell,pins = "mpp30", "mpp31", "mpp32",
@@ -55,9 +55,9 @@ }; }; - gpio0: gpio at d0018100 { + gpio0: gpio at 18100 { compatible = "marvell,orion-gpio"; - reg = <0xd0018100 0x40>; + reg = <0x18100 0x40>; ngpios = <32>; gpio-controller; #gpio-cells = <2>;
@@ -66,9 +66,9 @@ interrupts = <82>, <83>, <84>, <85>; }; - gpio1: gpio at d0018140 { + gpio1: gpio at 18140 { compatible = "marvell,orion-gpio"; - reg = <0xd0018140 0x40>; + reg = <0x18140 0x40>; ngpios = <17>; gpio-controller; #gpio-cells = <2>;
arch/arm/boot/dts/armada-xp-mv78260.dtsi +9 -9
@@ -47,7 +47,7 @@ soc { pinctrl { compatible = "marvell,mv78260-pinctrl"; - reg = <0xd0018000 0x38>; + reg = <0x18000 0x38>; sdio_pins: sdio-pins { marvell,pins = "mpp30", "mpp31", "mpp32",
@@ -56,9 +56,9 @@ }; }; - gpio0: gpio at d0018100 { + gpio0: gpio at 18100 { compatible = "marvell,orion-gpio"; - reg = <0xd0018100 0x40>; + reg = <0x18100 0x40>; ngpios = <32>; gpio-controller; #gpio-cells = <2>;
@@ -67,9 +67,9 @@ interrupts = <82>, <83>, <84>, <85>; }; - gpio1: gpio at d0018140 { + gpio1: gpio at 18140 { compatible = "marvell,orion-gpio"; - reg = <0xd0018140 0x40>; + reg = <0x18140 0x40>; ngpios = <32>; gpio-controller; #gpio-cells = <2>;
@@ -78,9 +78,9 @@ interrupts = <87>, <88>, <89>, <90>; }; - gpio2: gpio at d0018180 { + gpio2: gpio at 18180 { compatible = "marvell,orion-gpio"; - reg = <0xd0018180 0x40>; + reg = <0x18180 0x40>; ngpios = <3>; gpio-controller; #gpio-cells = <2>;
@@ -89,9 +89,9 @@ interrupts = <91>; }; - ethernet at d0034000 { + ethernet at 34000 { compatible = "marvell,armada-370-neta"; - reg = <0xd0034000 0x2500>; + reg = <0x34000 0x2500>; interrupts = <14>; clocks = <&gateclk 1>; status = "disabled";
arch/arm/boot/dts/armada-xp-mv78460.dtsi +9 -9
@@ -62,7 +62,7 @@ soc { pinctrl { compatible = "marvell,mv78460-pinctrl"; - reg = <0xd0018000 0x38>; + reg = <0x18000 0x38>; sdio_pins: sdio-pins { marvell,pins = "mpp30", "mpp31", "mpp32",
@@ -71,9 +71,9 @@ }; }; - gpio0: gpio at d0018100 { + gpio0: gpio at 18100 { compatible = "marvell,orion-gpio"; - reg = <0xd0018100 0x40>; + reg = <0x18100 0x40>; ngpios = <32>; gpio-controller; #gpio-cells = <2>;
@@ -82,9 +82,9 @@ interrupts = <82>, <83>, <84>, <85>; }; - gpio1: gpio at d0018140 { + gpio1: gpio at 18140 { compatible = "marvell,orion-gpio"; - reg = <0xd0018140 0x40>; + reg = <0x18140 0x40>; ngpios = <32>; gpio-controller; #gpio-cells = <2>;
@@ -93,9 +93,9 @@ interrupts = <87>, <88>, <89>, <90>; }; - gpio2: gpio at d0018180 { + gpio2: gpio at 18180 { compatible = "marvell,orion-gpio"; - reg = <0xd0018180 0x40>; + reg = <0x18180 0x40>; ngpios = <3>; gpio-controller; #gpio-cells = <2>;
@@ -104,9 +104,9 @@ interrupts = <91>; }; - ethernet at d0034000 { + ethernet at 34000 { compatible = "marvell,armada-370-neta"; - reg = <0xd0034000 0x2500>; + reg = <0x34000 0x2500>; interrupts = <14>; clocks = <&gateclk 1>; status = "disabled";
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +11 -11
@@ -27,11 +27,11 @@ }; soc { - serial at d0012000 { + serial at 12000 { clock-frequency = <250000000>; status = "okay"; }; - serial at d0012100 { + serial at 12100 { clock-frequency = <250000000>; status = "okay"; };
@@ -96,31 +96,31 @@ }; }; - ethernet at d0070000 { + ethernet at 70000 { status = "okay"; phy = <&phy0>; phy-mode = "sgmii"; }; - ethernet at d0074000 { + ethernet at 74000 { status = "okay"; phy = <&phy1>; phy-mode = "sgmii"; }; - ethernet at d0030000 { + ethernet at 30000 { status = "okay"; phy = <&phy2>; phy-mode = "sgmii"; }; - ethernet at d0034000 { + ethernet at 34000 { status = "okay"; phy = <&phy3>; phy-mode = "sgmii"; }; - i2c at d0011000 { + i2c at 11000 { status = "okay"; clock-frequency = <400000>; }; - i2c at d0011100 { + i2c at 11100 { status = "okay"; clock-frequency = <400000>;
@@ -129,14 +129,14 @@ reg = <0x30>; }; }; - sata at d00a0000 { + sata at a0000 { nr-ports = <2>; status = "okay"; }; - usb at d0050000 { + usb at 50000 { status = "okay"; }; - usb at d0051000 { + usb at 51000 { status = "okay"; }; };
arch/arm/boot/dts/armada-xp.dtsi +33 -32
143 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v3 8/9 ARM: dts: mvebu: introduce internal-regs node
In reply to Gregory CLEMENTIntroduce a 'internal-regs' subnode, under which all devices are moved. This is not really needed for now, but will be for the mvebu-mbus driver. This generates a lot of code movement since it's indenting by one more tab all the devices. So it was a good opportunity to fix all the bad indentation.
--- arch/arm/boot/dts/armada-370-db.dts | 108 +++++----- arch/arm/boot/dts/armada-370-mirabox.dts | 78 ++++---- arch/arm/boot/dts/armada-370-rd.dts | 2 + arch/arm/boot/dts/armada-370-xp.dtsi | 228 +++++++++++----------- arch/arm/boot/dts/armada-370.dtsi | 219 +++++++++++---------- arch/arm/boot/dts/armada-xp-db.dts | 154 +++++++-------- arch/arm/boot/dts/armada-xp-gp.dts | 124 ++++++------ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 56 +++--- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 80 ++++---- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 80 ++++---- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 196 ++++++++++--------- arch/arm/boot/dts/armada-xp.dtsi | 182 +++++++++-------- 12 files changed, 763 insertions(+), 744 deletions(-)
arch/arm/boot/dts/armada-370-db.dts +55 -53
@@ -30,68 +30,70 @@ }; soc { - serial at 12000 { - clock-frequency = <200000000>; - status = "okay"; - }; - sata at a0000 { - nr-ports = <2>; - status = "okay"; - }; - - mdio { - phy0: ethernet-phy at 0 { - reg = <0>; + internal-regs { + serial at 12000 { + clock-frequency = <200000000>; + status = "okay"; + }; + sata at a0000 { + nr-ports = <2>; + status = "okay"; }; - phy1: ethernet-phy at 1 { - reg = <1>; + mdio { + phy0: ethernet-phy at 0 { + reg = <0>; + }; + + phy1: ethernet-phy at 1 { + reg = <1>; + }; }; - }; - ethernet at 70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - ethernet at 74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; + ethernet at 70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + ethernet at 74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; - mvsdio at d4000 { - pinctrl-0 = <&sdio_pins1>; - pinctrl-names = "default"; - /* - * This device is disabled by default, because - * using the SD card connector requires - * changing the default CON40 connector - * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a - * different connector - * "DB-88F6710_MPP_RGMII_SD_Jumper". - */ - status = "disabled"; - /* No CD or WP GPIOs */ - }; + mvsdio at d4000 { + pinctrl-0 = <&sdio_pins1>; + pinctrl-names = "default"; + /* + * This device is disabled by default, because + * using the SD card connector requires + * changing the default CON40 connector + * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a + * different connector + * "DB-88F6710_MPP_RGMII_SD_Jumper". + */ + status = "disabled"; + /* No CD or WP GPIOs */ + }; - usb at 50000 { - status = "okay"; - }; + usb at 50000 { + status = "okay"; + }; - usb at 51000 { - status = "okay"; - }; + usb at 51000 { + status = "okay"; + }; - spi0: spi at 10600 { - status = "okay"; + spi0: spi at 10600 { + status = "okay"; - spi-flash at 0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "mx25l25635e"; - reg = <0>; /* Chip select 0 */ - spi-max-frequency = <50000000>; + spi-flash at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "mx25l25635e"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <50000000>; + }; }; }; };
arch/arm/boot/dts/armada-370-mirabox.dts +40 -38
90 lines not on this page · raw message
arch/arm/boot/dts/armada-370-rd.dts +2 -0
@@ -28,6 +28,7 @@ }; soc { + internal-regs { serial at 12000 { clock-frequency = <200000000>; status = "okay";
@@ -72,5 +73,6 @@ usb at 51000 { status = "okay"; }; + }; }; };
arch/arm/boot/dts/armada-370-xp.dtsi +116 -112
274 lines not on this page · raw message
arch/arm/boot/dts/armada-370.dtsi +109 -110
247 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-db.dts +78 -76
173 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-gp.dts +63 -61
139 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-mv78230.dtsi +29 -27
66 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-mv78260.dtsi +41 -39
97 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-mv78460.dtsi +41 -39
97 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +99 -97
216 lines not on this page · raw message
arch/arm/boot/dts/armada-xp.dtsi +90 -92
225 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v3 9/9 ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
In reply to Gregory CLEMENTIn 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.
--- arch/arm/boot/dts/armada-370-xp.dtsi | 4 ++-- arch/arm/boot/dts/armada-370.dtsi | 2 ++ arch/arm/boot/dts/armada-xp-db.dts | 2 +- arch/arm/boot/dts/armada-xp-gp.dts | 14 ++++++++------ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-)
arch/arm/boot/dts/armada-370-xp.dtsi +2 -2
@@ -16,7 +16,7 @@ * 370 and Armada XP SoC. */ -/include/ "skeleton.dtsi" +/include/ "skeleton64.dtsi" / { model = "Marvell Armada 370 and XP SoC";
@@ -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";
arch/arm/boot/dts/armada-370.dtsi +2 -0
@@ -16,6 +16,7 @@ */ /include/ "armada-370-xp.dtsi" +/include/ "skeleton.dtsi" / { model = "Marvell Armada 370 family SoC";
@@ -28,6 +29,7 @@ }; soc { + ranges = <0 0xd0000000 0x100000>; internal-regs { system-controller at 18200 { compatible = "marvell,armada-370-xp-system-controller";
arch/arm/boot/dts/armada-xp-db.dts +1 -1
@@ -26,7 +26,7 @@ memory { device_type = "memory"; - reg = <0x00000000 0x80000000>; /* 2 GB */ + reg = <0 0x00000000 0 0x80000000>; /* 2 GB */ }; soc {
arch/arm/boot/dts/armada-xp-gp.dts +8 -6
@@ -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 {
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +1 -1
@@ -23,7 +23,7 @@ memory { device_type = "memory"; - reg = <0x00000000 0xC0000000>; /* 3 GB */ + reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */ }; soc {
Signature · 1 line
1.7.9.5