ARM: dts: kirkwood: set default pinctrl for NAND

There is only one valid pinctrl setting for NAND on Kirkwood. Now that we
have the setting in the common SoC pinctrl, move it to the NAND controller
node directly and remove it from the individual boards.

While at it, also fix up status = "okay" to "ok" on one board's NAND node.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-12-git-send-email-sebastian.hesselbarth@gmail.comSigned-off-by: Jason Cooper <jason@lakedaemon.net>

arch/arm/boot/dts/kirkwood-db.dtsi

@@ -57,8 +57,6 @@ mvsdio@90000 {
 };
 
 &nand {
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 	chip-delay = <25>;
 	status = "okay";
 

arch/arm/boot/dts/kirkwood-dnskw.dtsi

@@ -183,8 +183,6 @@ sata1_power: regulator@2 {
 };
 
 &nand {
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 	status = "okay";
 	chip-delay = <35>;
 

arch/arm/boot/dts/kirkwood-ib62x0.dts

@@ -105,8 +105,6 @@ gpio_poweroff {
 
 &nand {
 	status = "okay";
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 
 	partition@0 {
 		label = "u-boot";

arch/arm/boot/dts/kirkwood-km_kirkwood.dts

@@ -46,9 +46,7 @@ i2c@0 {
 };
 
 &nand {
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
-	status = "ok";
+	status = "okay";
 	chip-delay = <25>;
 };
 

arch/arm/boot/dts/kirkwood-laplug.dts

@@ -138,7 +138,6 @@ usb_power_front: regulator@3 {
 &nand {
 	/* Total size : 512MB */
 	status = "okay";
-	pinctrl-0 = <&pmx_nand>;
 
 	partition@0 {
 		label = "u-boot";

arch/arm/boot/dts/kirkwood-mplcec4.dts

@@ -162,8 +162,6 @@ misc {
 };
 
 &nand {
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 	status = "okay";
 
 	partition@0 {

arch/arm/boot/dts/kirkwood-openblocks_a6.dts

@@ -130,8 +130,6 @@ button@1 {
 &nand {
 	chip-delay = <25>;
 	status = "okay";
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 
 	partition@0 {
 		label = "uboot";

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

@@ -148,8 +148,6 @@ button@1 {
 &nand {
 	chip-delay = <25>;
 	status = "okay";
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 
 	partition@0 {
 		label = "uboot";

arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi

@@ -71,8 +71,6 @@ usb_power: regulator@1 {
 };
 
 &nand {
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 	status = "okay";
 
 	partition@0 {

arch/arm/boot/dts/kirkwood-topkick.dts

@@ -174,8 +174,6 @@ sata0_power: regulator@1 {
 
 &nand {
 	status = "okay";
-	pinctrl-0 = <&pmx_nand>;
-	pinctrl-names = "default";
 
 	partition@0 {
 		label = "u-boot";

arch/arm/boot/dts/kirkwood.dtsi

@@ -61,6 +61,8 @@ nand: nand@012f {
 			chip-delay = <25>;
 			/* set partition map and/or chip-delay in board dts */
 			clocks = <&gate_clk 7>;
+			pinctrl-0 = <&pmx_nand>;
+			pinctrl-names = "default";
 			status = "disabled";
 		};
 	};