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.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 2790f46..812df69 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -57,8 +57,6 @@
 };
 
 &nand {
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
        chip-delay = <25>;
        status = "okay";
 

diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index bcc6e0f..113dcf0 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -183,8 +183,6 @@
 };
 
 &nand {
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
        status = "okay";
        chip-delay = <35>;
 

diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 6804638..bfa5edd 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -105,8 +105,6 @@
 
 &nand {
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "u-boot";

diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index db14bd0..61139bf 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -46,9 +46,7 @@
 };
 
 &nand {
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
-       status = "ok";
+       status = "okay";
        chip-delay = <25>;
 };
 

diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 4c91fbb..642755a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -138,7 +138,6 @@
 &nand {
        /* Total size : 512MB */
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
 
        partition@0 {
                label = "u-boot";

diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 79796c8..f3a9918 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -162,8 +162,6 @@
 };
 
 &nand {
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
        status = "okay";
 
        partition@0 {

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 1e056b3..00c2e5a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -130,8 +130,6 @@
 &nand {
        chip-delay = <25>;
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "uboot";

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 07f6bf6..bc07aa5 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -148,8 +148,6 @@
 &nand {
        chip-delay = <25>;
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "uboot";

diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index e2c43ae..7196c7f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -71,8 +71,6 @@
 };
 
 &nand {
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
        status = "okay";
 
        partition@0 {

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 14b1218..a4dd47a 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -174,8 +174,6 @@
 
 &nand {
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "u-boot";

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 0c8d8fa..caafcde 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -61,6 +61,8 @@
                        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";
                };
        };