ARM: mvebu: use armada-370-sata for SATA on Armada 375

PATCH New Thomas Petazzoni 3 participants 6 messages Feb 10, 2016 – Feb 12, 2016

Subsystems (2)

Stable branch Device tree bindings

lore

Share & tools

lore

Thomas Petazzoni

author

2016-02-10 16:29 UTC #0 lore raw

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.

Fixes 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")

Cc <[email protected]>

Signed-off-by Lior Amsalem <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
Changes since v1:
- Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-375.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/armada-375.dtsi +1 -1

index 7ccce75..cc952cf 100644
@@ -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

Thomas Petazzoni

author

2016-02-10 16:29 UTC #1 lore raw

PATCH v2 2/2 ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB

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]>

---
Changes since v1:
- Use the new MTD partitions DT binding, with all partitions grouped into a 'partitions' subnode. Suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-370-db.dts | 27 +++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-db.dts  | 28 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

arch/arm/boot/dts/armada-370-db.dts +27 -0

index bb280de..2364fc5 100644
@@ -168,6 +168,33 @@
 					spi-max-frequency = <50000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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 +28 -0

index f774101..96aaaed 100644
@@ -229,6 +229,34 @@
 					spi-max-frequency = <20000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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

Andrew Lunn

2016-02-10 17:18 UTC #2 lore raw

PATCH v2 2/2 ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB

Quoted 5 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]>

Reviewed-by Andrew Lunn <[email protected]>

Thanks
Andrew

Quoted 89 lines

---
Changes since v1:
- Use the new MTD partitions DT binding, with all partitions grouped into a 'partitions' subnode. Suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-370-db.dts | 27 +++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-db.dts  | 28 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

arch/arm/boot/dts/armada-370-db.dts +27 -0

index bb280de..2364fc5 100644
@@ -168,6 +168,33 @@
 					spi-max-frequency = <50000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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 +28 -0

index f774101..96aaaed 100644
@@ -229,6 +229,34 @@
 					spi-max-frequency = <20000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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

Gregory CLEMENT

2016-02-12 16:50 UTC #3 lore raw

PATCH v2 2/2 ARM: mvebu: add NAND description to Armada 370 DB and Armada XP DB

In reply to Thomas Petazzoni

Hi Thomas,

Quoted 5 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]>

Applied on mvebu/dt, I renamed the patch to: "ARM: dts: mvebu: add NAND description to Armada 370 DB and Armada XP DB" to unify the way we label the dt related patch. I also added the reviewed-by tag from Andrew.

Thanks,

Gregory

Quoted 89 lines

---
Changes since v1:
- Use the new MTD partitions DT binding, with all partitions grouped into a 'partitions' subnode. Suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-370-db.dts | 27 +++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-db.dts  | 28 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

arch/arm/boot/dts/armada-370-db.dts +27 -0

index bb280de..2364fc5 100644
@@ -168,6 +168,33 @@
 					spi-max-frequency = <50000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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 +28 -0

index f774101..96aaaed 100644
@@ -229,6 +229,34 @@
 					spi-max-frequency = <20000000>;
 				};
 			};
+
+			nand at d0000 {
+				status = "okay";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					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

Signature · 4 lines

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Andrew Lunn

2016-02-10 17:17 UTC #4 lore raw

PATCH v2 1/2 ARM: mvebu: use armada-370-sata for SATA on Armada 375

In reply to Thomas Petazzoni

Quoted 6 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_CTL register for SATA hotplug to work.

Quoted 8 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.
Fixes 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")
Cc <[email protected]>
Signed-off-by Lior Amsalem <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>

Reviewed-by Andrew Lunn <[email protected]>

Thanks for adding the tags,

Andrew

Quoted 23 lines

---
Changes since v1:
- Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-375.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/armada-375.dtsi +1 -1

index 7ccce75..cc952cf 100644
@@ -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

Gregory CLEMENT

2016-02-12 16:49 UTC #5 lore raw

PATCH v2 1/2 ARM: mvebu: use armada-370-sata for SATA on Armada 375

In reply to Thomas Petazzoni

Hi Thomas,

Quoted 6 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_CTL register for SATA hotplug to work.

Quoted 8 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.
Fixes 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")
Cc <[email protected]>
Signed-off-by Lior Amsalem <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>

Applied on mvebu/dt, I renamed the patch to: " ARM: dts: armada-375: use armada-370-sata for SATA" to unify the way we labl the dt related patch. I also adde the reviwed-by tag from Andrew.

Thanks,

Gregory

Quoted 23 lines

---
Changes since v1:
- Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.

---
 arch/arm/boot/dts/armada-375.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/boot/dts/armada-375.dtsi +1 -1

index 7ccce75..cc952cf 100644
@@ -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

Signature · 4 lines

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com