Skip to contentSkip to conversation

ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS .dts files

PATCH New Arnaud Ebalard 2 participants 5 messages Dec 6, 2013 – Dec 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS .dts files

Now that NAND controller support is available for Armada 370/XP (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), let's enable support for ReadyNAS boards.

The three commits in this series all include the partitions definitions specific to each ReadyNAS variant as delivered by NETGEAR with standard images.

As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet.

Each patch has been tested on each specific device using Ezequiel's tree; last known bug having being fixed today.

Jason, Ezequiel, this is a v0. I do not mind at all waiting for a heads up to repost it later when every bit of nand support is where it should be.

Ezequiel, I have left a comment in the .dts file to indicate a lost reader that the last MB of last partition is in practice not writable.

Cheers,

a+

Arnaud Ebalard (3):
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 102 .dts file
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 104 .dts file
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 2120 .dts file

 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 36 ++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 36 ++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 36 ++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
Signature · 1 line
1.8.4.4
#1 lore raw

PATCH 1/3 ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file

Now that NAND controller support is available for Armada 370 (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 102 and defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet.

---
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +36 -0
index 1c2d13d..6a7383f 100644
@@ -131,6 +131,42 @@
 					pwm_polarity = <0>;
 				};
 			};
+
+			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 = <0x0000000 0x180000>;  /* 1.5MB */
+					read-only;
+				};
+
+				partition at 180000 {
+					label = "u-boot-env";
+					reg = <0x180000 0x20000>;    /* 128KB */
+					read-only;
+				};
+
+				partition at 200000 {
+					label = "uImage";
+					reg = <0x0200000 0x600000>;    /* 6MB */
+				};
+
+				partition at 800000 {
+					label = "minirootfs";
+					reg = <0x0800000 0x400000>;    /* 4MB */
+				};
+
+				/* Last MB is for the BBT, i.e. not writable */
+				partition at c00000 {
+					label = "ubifs";
+					reg = <0x0c00000 0x7400000>; /* 116MB */
+				};
+			};
 		};
 	};
 
Signature · 1 line
1.8.4.4
#2 lore raw

PATCH 2/3 ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file

In reply to Arnaud Ebalard

Now that NAND controller support is available for Armada 370 (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 104 and defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet.

---
 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
arch/arm/boot/dts/armada-370-netgear-rn104.dts +36 -0
index e48e5fb..272e2e2 100644
@@ -133,6 +133,42 @@
 					reg = <0x23>;
 				};
 			};
+
+			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 = <0x0000000 0x180000>;  /* 1.5MB */
+					read-only;
+				};
+
+				partition at 180000 {
+					label = "u-boot-env";
+					reg = <0x180000 0x20000>;    /* 128KB */
+					read-only;
+				};
+
+				partition at 200000 {
+					label = "uImage";
+					reg = <0x0200000 0x600000>;    /* 6MB */
+				};
+
+				partition at 800000 {
+					label = "minirootfs";
+					reg = <0x0800000 0x400000>;    /* 4MB */
+				};
+
+				/* Last MB is for the BBT, i.e. not writable */
+				partition at c00000 {
+					label = "ubifs";
+					reg = <0x0c00000 0x7400000>; /* 116MB */
+				};
+			};
 		};
 	};
 
Signature · 1 line
1.8.4.4
#3 lore raw

PATCH 3/3 ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file

In reply to Arnaud Ebalard

Now that NAND controller support is available for Armada XP (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 2120 and defines default partition layout as delivered by NETGEAR.

As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet.

---
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +36 -0
index 8b2a787..f048b4e 100644
@@ -211,6 +211,42 @@
 					reg = <0x4c>;
 				};
 			};
+
+			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 = <0x0000000 0x180000>;  /* 1.5MB */
+					read-only;
+				};
+
+				partition at 180000 {
+					label = "u-boot-env";
+					reg = <0x180000 0x20000>;    /* 128KB */
+					read-only;
+				};
+
+				partition at 200000 {
+					label = "uImage";
+					reg = <0x0200000 0x600000>;    /* 6MB */
+				};
+
+				partition at 800000 {
+					label = "minirootfs";
+					reg = <0x0800000 0x400000>;    /* 4MB */
+				};
+
+				/* Last MB is for the BBT, i.e. not writable */
+				partition at c00000 {
+					label = "ubifs";
+					reg = <0x0c00000 0x7400000>; /* 116MB */
+				};
+			};
 		};
 	};
 
Signature · 1 line
1.8.4.4
#4 lore raw

cover ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS .dts files

In reply to Arnaud Ebalard
Quoted 15 lines · Arnaud Ebalard

Now that NAND controller support is available for Armada 370/XP (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), let's enable support for ReadyNAS boards.

The three commits in this series all include the partitions definitions specific to each ReadyNAS variant as delivered by NETGEAR with standard images.

As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM:
mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet.

Quoted 6 lines

Each patch has been tested on each specific device using Ezequiel's tree; last known bug having being fixed today.

Jason, Ezequiel, this is a v0. I do not mind at all waiting for a heads up to repost it later when every bit of nand support is where it should be.

This seems fine by me. Once the binding are agreed upon, dts changes can occur independent of code changes.

Quoted 13 lines

Ezequiel, I have left a comment in the .dts file to indicate a lost reader that the last MB of last partition is in practice not writable.

Cheers,

a+

Arnaud Ebalard (3):
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 102 .dts file
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 104 .dts file
ARM: mvebu: Enable NAND controller in NETGEAR ReadyNAS 2120 .dts file

Quoted 4 lines
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 36 ++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 36 ++++++++++++++++++++++++++
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 36 ++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)

Whole series applied to mvebu/dt

thx,

Jason.