Merge git://git.kvack.org/~bcrl/aio-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / kirkwood-b3.dts

diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index 6becedebaa4e946e9fc080096a771053d06854df..c9247f8672ae14c24487f9b6902187c48e25fcd3 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -30,6 +30,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200n8 earlyprintk";
+               stdout-path = &uart0;
        };
 
        mbus {
@@ -44,7 +45,7 @@
        };
 
        ocp@f1000000 {
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
                        pmx_button_power: pmx-button-power {
                                marvell,pins = "mpp39";
                                marvell,function = "gpio";
@@ -69,8 +70,6 @@
 
                spi@10600 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_spi>;
-                       pinctrl-names = "default";
 
                        m25p16@0 {
                                #address-cells = <1>;
@@ -113,8 +112,6 @@
                         * UART0_TX = Testpoint 66
                         * See the Excito Wiki for more details.
                         */
-                       pinctrl-0 = <&pmx_uart0>;
-                       pinctrl-names = "default";
                        status = "okay";
                };