From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Jul 2014 06:07:11 +0000 (-0700)
Subject: Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"
X-Git-Tag: v3.17-rc1~122^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22524b02b17b901f28a62229f8c32416c8e8acfe;p=thirdparty%2Fkernel%2Flinux.git

Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"

This reverts commit 9da433c0a0b5f71ac92dc9dca778295649675f08.

Vineet writes:

Could you please revert this single patch from tty-next for 3.17 as the
needed core changes are not yet finalized.

Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index 298a46daa6332..6b57475967a6f 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -17,8 +17,7 @@
 	interrupt-parent = <&intc>;
 
 	chosen {
-		bootargs = "earlycon";
-		stdout-path = &arcuart0;
+		bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
 	};
 
 	aliases {