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

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

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index d6368c39102e743ef74465f94a032ef8d94f7e70..26cf0e0ccefd3772f6e194b8102ea751408d3f6f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -22,6 +22,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200n8";
+               stdout-path = &uart0;
        };
 
        mbus {
@@ -35,7 +36,7 @@
        };
 
        ocp@f1000000 {
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_sdio_cd>;
                        pinctrl-names = "default";