Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

[cascardo/linux.git] / arch / arm / boot / dts / r8a7794-silk.dts

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 58f0ddf..5153e3a 100644 (file)
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -24,7 +24,7 @@
 
        chosen {
                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
-               stdout-path = &scif2;
+               stdout-path = "serial0:115200n8";
        };
 
        memory@40000000 {
@@ -204,6 +204,7 @@
                m25p,fast-read;
 
                partitions {
+                       compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;