From 932dab123a8990f12ea2f466492990f9ed14416d Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Sat, 25 Aug 2012 19:24:20 +0400
Subject: [PATCH] --- yaml --- r: 325715 b: refs/heads/master c:
 be282059acebcecd789fad1b3d17d826db3d5608 h: refs/heads/master i:   325713:
 bae3d180b31d8339643fd169209b2174c9edb55c   325711:
 eb3838559520e1ff1f598948313c7e213eecb88d v: v3

---
 [refs]                            |  2 +-
 trunk/arch/mips/sni/a20r.c        | 32 +++++++++++++++++++++++++++++++
 trunk/drivers/tty/serial/sc26xx.c |  3 +++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5e4d6961dbcc..2d7783e07ba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d65c0b12656d9f3bc29bb19f2d7441832433f03
+refs/heads/master: be282059acebcecd789fad1b3d17d826db3d5608
diff --git a/trunk/arch/mips/sni/a20r.c b/trunk/arch/mips/sni/a20r.c
index c48194c3073b..b2d4f492d782 100644
--- a/trunk/arch/mips/sni/a20r.c
+++ b/trunk/arch/mips/sni/a20r.c
@@ -133,6 +133,38 @@ static struct platform_device sc26xx_pdev = {
 	}
 };
 
+#warning "Please try migrate to use new driver SCCNXP and report the status" \
+	 "in the linux-serial mailing list."
+
+/* The code bellow is a replacement of SC26XX to SCCNXP */
+#if 0
+#include <linux/platform_data/sccnxp.h>
+
+static struct sccnxp_pdata sccnxp_data = {
+	.reg_shift	= 2,
+	.frequency	= 3686400,
+	.mctrl_cfg[0]	= MCTRL_SIG(DTR_OP, LINE_OP7) |
+			  MCTRL_SIG(RTS_OP, LINE_OP3) |
+			  MCTRL_SIG(DSR_IP, LINE_IP5) |
+			  MCTRL_SIG(DCD_IP, LINE_IP6),
+	.mctrl_cfg[1]	= MCTRL_SIG(DTR_OP, LINE_OP2) |
+			  MCTRL_SIG(RTS_OP, LINE_OP1) |
+			  MCTRL_SIG(DSR_IP, LINE_IP0) |
+			  MCTRL_SIG(CTS_IP, LINE_IP1) |
+			  MCTRL_SIG(DCD_IP, LINE_IP2) |
+			  MCTRL_SIG(RNG_IP, LINE_IP3),
+};
+
+static struct platform_device sc2681_pdev = {
+	.name		= "sc2681",
+	.resource	= sc2xxx_rsrc,
+	.num_resources	= ARRAY_SIZE(sc2xxx_rsrc),
+	.dev	= {
+		.platform_data	= &sccnxp_data,
+	},
+};
+#endif
+
 static u32 a20r_ack_hwint(void)
 {
 	u32 status = read_c0_status();
diff --git a/trunk/drivers/tty/serial/sc26xx.c b/trunk/drivers/tty/serial/sc26xx.c
index 3992e48b4c71..9d664242b312 100644
--- a/trunk/drivers/tty/serial/sc26xx.c
+++ b/trunk/drivers/tty/serial/sc26xx.c
@@ -22,6 +22,9 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 
+#warning "Please try migrate to use new driver SCCNXP and report the status" \
+	 "in the linux-serial mailing list."
+
 #if defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif