arm: kirkwood: ib62x0: add u-boot environment partition

Commit Message

Luka Perkov Oct. 3, 2013, 3:06 a.m. UTC

Also, add some trivial cosmetic fixes.

Signed-off-by: Luka Perkov <[e-mail]>
---
 arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Patch

diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index cb711a3..3f970c6 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -5,7 +5,7 @@ 
 
 / {
 	model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
-	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "marvell,kirkwood-88f6281", "marvell,kirkwood";
+	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	memory {
 		device_type = "memory";
@@ -43,6 +43,7 @@ 
 				marvell,function = "gpio";
 			};
 		};
+
 		serial@12000 {
 			status = "okay";
 		};
@@ -59,7 +60,12 @@ 
 
 			partition@0 {
 				label = "u-boot";
-				reg = <0x0000000 0x100000>;
+				reg = <0x0000000 0xe0000>;
+			};
+
+			partition@e0000 {
+				label = "u-boot environment";
+				reg = <0xe0000 0x100000>;
 			};
 
 			partition@100000 {
@@ -71,7 +77,6 @@ 
 				label = "root";
 				reg = <0x0700000 0xf900000>;
 			};
-
 		};
 	};
 
@@ -93,6 +98,7 @@ 
 			gpios = <&gpio0 28 1>;
 		};
 	};
+
 	gpio-leds {
 		compatible = "gpio-leds";
 		pinctrl-0 = <&pmx_led_os_red &pmx_led_os_green
@@ -113,14 +119,13 @@ 
 			gpios = <&gpio0 27 0>;
 		};
 	};
+
 	gpio_poweroff {
 		compatible = "gpio-poweroff";
 		pinctrl-0 = <&pmx_power_off>;
 		pinctrl-names = "default";
 		gpios = <&gpio0 24 0>;
 	};
-
-
 };
 
 &mdio {
@@ -134,6 +139,7 @@ 
 
 &eth0 {
 	status = "okay";
+
 	ethernet0-port@0 {
 		phy-handle = <&ethphy0>;
 	};