summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood-laplug.dts
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-04-30 14:56:38 +0200
committerJason Cooper <jason@lakedaemon.net>2014-05-05 00:53:06 +0000
commitcbfaea96acff4c687b0d9abf25325d9d5b073df1 (patch)
tree05d2135e3bcb1512b842925d4916a0910b8bbcad /arch/arm/boot/dts/kirkwood-laplug.dts
parent929012010ae514c091096ba5cfa1bdbac44d67e7 (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-laplug.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-laplug.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 4c91fbb084c..642755acf2f 100644
--- 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";