6 files changed, 16 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/kirkwood-is2.dts b/arch/arm/boot/dts/kirkwood-is2.dts
index 0bdce0ad7277..c3f036b86cca 100644
--- a/arch/arm/boot/dts/kirkwood-is2.dts
+++ b/arch/arm/boot/dts/kirkwood-is2.dts
@@ -13,6 +13,8 @@
 
         ocp@f1000000 {
                 sata@80000 {
+                        pinctrl-0 = <&pmx_ns2_sata0>;
+                        pinctrl-names = "default";
                         status = "okay";
                         nr-ports = <1>;
                 };
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 6affd924fe11..2afac0405816 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -8,10 +8,6 @@
 
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
-                        pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
-                                        &pmx_ns2_sata0 &pmx_ns2_sata1>;
-                        pinctrl-names = "default";
-
                         pmx_ns2_sata0: pmx-ns2-sata0 {
                                 marvell,pins = "mpp21";
                                 marvell,function = "sata0";
@@ -23,10 +19,14 @@
                 };
 
                 serial@12000 {
+                        pinctrl-0 = <&pmx_uart0>;
+                        pinctrl-names = "default";
                         status = "okay";
                 };
 
                 spi@10600 {
+                        pinctrl-0 = <&pmx_spi>;
+                        pinctrl-names = "default";
                         status = "okay";
 
                         flash@0 {
@@ -45,6 +45,8 @@
                 };
 
                 i2c@11000 {
+                        pinctrl-0 = <&pmx_twsi0>;
+                        pinctrl-names = "default";
                         status = "okay";
 
                         eeprom@50 {
diff --git a/arch/arm/boot/dts/kirkwood-ns2.dts b/arch/arm/boot/dts/kirkwood-ns2.dts
index f2d36ecf36d8..b50e93d7796c 100644
--- a/arch/arm/boot/dts/kirkwood-ns2.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2.dts
@@ -13,6 +13,8 @@
 
         ocp@f1000000 {
                 sata@80000 {
+                        pinctrl-0 = <&pmx_ns2_sata0>;
+                        pinctrl-names = "default";
                         status = "okay";
                         nr-ports = <1>;
                 };
diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts
index b02eb4ea1bb4..af8259fe8955 100644
--- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
@@ -13,6 +13,8 @@
 
         ocp@f1000000 {
                 sata@80000 {
+                        pinctrl-0 = <&pmx_ns2_sata0>;
+                        pinctrl-names = "default";
                         status = "okay";
                         nr-ports = <1>;
                 };
diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/kirkwood-ns2max.dts
index bcec4d6cada7..85f24d227e17 100644
--- a/arch/arm/boot/dts/kirkwood-ns2max.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2max.dts
@@ -13,6 +13,8 @@
 
         ocp@f1000000 {
                 sata@80000 {
+                        pinctrl-0 = <&pmx_ns2_sata0 &pmx_ns2_sata1>;
+                        pinctrl-names = "default";
                         status = "okay";
                         nr-ports = <2>;
                 };
diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts
index adab1ab25733..329e530bffe7 100644
--- a/arch/arm/boot/dts/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts
@@ -14,6 +14,8 @@
 
         ocp@f1000000 {
                 sata@80000 {
+                        pinctrl-0 = <&pmx_ns2_sata0>;
+                        pinctrl-names = "default";
                         status = "okay";
                         nr-ports = <1>;
                 };