ARM: mvebu: misc DT improvements
cover ARM: mvebu: misc DT improvements
Hello,
Here are two fixes/improvements for Marvell EBU platforms, which were initially sent on June 18th 2015, and never got any feedback.
This new iteration is simply rebased on v4.5-rc1 with no other changes.
Thanks!
Thomas
Lior Amsalem (1):
ARM: mvebu: use armada-370-sata for SATA on Armada 375
Thomas Petazzoni (1):
ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB
arch/arm/boot/dts/armada-370-db.dts | 21 +++++++++++++++++++++ arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)
Signature · 1 line
2.6.4
PATCH v2 1/2 ARM: mvebu: use armada-370-sata for SATA on Armada 375
From: Lior Amsalem <[email protected]>
The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which requires the PHY speed to be set in the LP_PHY_CTL register for SATA hotplug to work.
Therefore, this commit updates the compatible string used to describe the SATA IP in Armada 375 from marvell,orion-sata to marvell,armada-370-sata.
--- arch/arm/boot/dts/armada-375.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/armada-375.dtsi +1 -1
@@ -529,7 +529,7 @@ }; sata at a0000 { - compatible = "marvell,orion-sata"; + compatible = "marvell,armada-370-sata"; reg = <0xa0000 0x5000>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gateclk 14>, <&gateclk 20>;
Signature · 1 line
2.6.4
PATCH v2 1/2 ARM: mvebu: use armada-370-sata for SATA on Armada 375
Quoted 5 lines · Thomas Petazzoni
From: Lior Amsalem <[email protected]>
The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which requires the PHY speed to be set in the
LP_PHY_CTLregister for SATA hotplug to work.
Hi Thomas
Should this have a fixes: tag?
Andrew
Quoted 27 lines
Therefore, this commit updates the compatible string used to describe the SATA IP in Armada 375 from marvell,orion-sata to marvell,armada-370-sata.
Signed-off-by Lior Amsalem <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>--- arch/arm/boot/dts/armada-375.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/boot/dts/armada-375.dtsi +1
-1@@ -529,7 +529,7 @@ }; sata at a0000 { - compatible = "marvell,orion-sata"; + compatible = "marvell,armada-370-sata"; reg = <0xa0000 0x5000>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gateclk 14>, <&gateclk 20>;Signature · 1 line
2.6.4
PATCH v2 2/2 ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB
In reply to Thomas PetazzoniThis commit adds the Device Tree description for the 1GB NAND flash present in the Armada 370 DB and Armada XP DB evaluation boards from Marvell.
--- arch/arm/boot/dts/armada-370-db.dts | 21 +++++++++++++++++++++ arch/arm/boot/dts/armada-xp-db.dts | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+)
arch/arm/boot/dts/armada-370-db.dts +21 -0
@@ -168,6 +168,27 @@ spi-max-frequency = <50000000>; }; }; + + nand at d0000 { + status = "okay"; + num-cs = <1>; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition at 800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition at 1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; }; pcie-controller {
arch/arm/boot/dts/armada-xp-db.dts +21 -0
@@ -229,6 +229,27 @@ spi-max-frequency = <20000000>; }; }; + + nand at d0000 { + status = "okay"; + num-cs = <1>; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition at 800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition at 1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; }; }; };
Signature · 1 line
2.6.4
PATCH v2 2/2 ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB
Quoted 20 lines · Thomas Petazzoni
This commit adds the Device Tree description for the 1GB NAND flash present in the Armada 370 DB and Armada XP DB evaluation boards from Marvell.
Signed-off-by Thomas Petazzoni <[email protected]>--- arch/arm/boot/dts/armada-370-db.dts | 21 +++++++++++++++++++++ arch/arm/boot/dts/armada-xp-db.dts | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+)arch/arm/boot/dts/armada-370-db.dts +2
-0@@ -168,6 +168,27 @@ spi-max-frequency = <50000000>; }; }; + + nand at d0000 {
arch/arm/boot/dts/armada-370-db.dts line 182
Quoted 10 lines
arch/arm/boot/dts/armada-370-db.dts +10
-0+ status = "okay"; + num-cs = <1>; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + };
Hi Thomas
Documentation/devicetree/bindings/mtd/partition.txt:
The partition table should be a subnode of the mtd node and should be named 'partitions'. This node should have the following property:
- compatible : (required) must be "fixed-partitions"
Partitions are then defined in subnodes of the partitions node.
For backwards compatibility partitions as direct subnodes of the mtd device are supported. This use is discouraged.
We should try to get this right when adding new DT nodes.
Andrew
cover ARM: mvebu: misc DT improvements
In reply to Thomas PetazzoniHi Thomas,
Quoted 7 lines · Thomas Petazzoni
Hello,
Here are two fixes/improvements for Marvell EBU platforms, which were initially sent on June 18th 2015, and never got any feedback.
This new iteration is simply rebased on v4.5-rc1 with no other changes.
Could you send a new version taking into account the comment from Andrew?
Thanks,
Gregory
Quoted 24 lines
Thanks!
Thomas
Lior Amsalem (1):
ARM: mvebu: use armada-370-sata for SATA on Armada 375Thomas Petazzoni (1):
ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DBarch/arm/boot/dts/armada-370-db.dts | 21 +++++++++++++++++++++ arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)Signature · 7 lines
2.6.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com