Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / arm / boot / dts / r8a7778-bockw.dts

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 158ad94fd4d187a708274415067d7f8b368e9cfb..a52b359e2ae24a300e9cc5f5de946d3005ad2afe 100644 (file)
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -28,8 +28,8 @@
        };
 
        chosen {
-               bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw";
-               stdout-path = &scif0;
+               bootargs = "ignore_loglevel ip=dhcp root=/dev/nfs rw";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -199,6 +199,7 @@
                m25p,fast-read;
 
                partitions {
+                       compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;