1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 1ff848d570a9..7196c7f3e109 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -17,10 +17,11 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
+                stdout-path = &uart0;
         };
 
         ocp@f1000000 {
-                pinctrl: pinctrl@10000 {
+                pinctrl: pin-controller@10000 {
 
                         pmx_usb_power_enable: pmx-usb-power-enable {
                                 marvell,pins = "mpp29";
@@ -44,8 +45,6 @@
                         };
                 };
                 serial@12000 {
-                        pinctrl-0 = <&pmx_uart0>;
-                        pinctrl-names = "default";
                         status = "okay";
                 };
         };
@@ -72,8 +71,6 @@
 };
 
 &nand {
-        pinctrl-0 = <&pmx_nand>;
-        pinctrl-names = "default";
         status = "okay";
 
         partition@0 {