From: 林辉辉 <lhh@rock-chips.com>
Date: Mon, 17 May 2010 15:29:50 +0000 (+0000)
Subject: updata serial and console
X-Git-Tag: firefly_0821_release~11519
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f3b6482117aec4c25360b7a6e6ec3f2967d86e14;p=firefly-linux-kernel-4.4.55.git

updata serial and console
---

diff --git a/.config b/.config
index 9a8fe8a8f879..78d587620ca0 100644
--- a/.config
+++ b/.config
@@ -425,8 +425,9 @@ CONFIG_WIRELESS_EXT_SYSFS=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
diff --git a/drivers/input/keyboard/rk2818_adckey.c b/drivers/input/keyboard/rk2818_adckey.c
index 909a7376e90c..3e15adb528e6 100644
--- a/drivers/input/keyboard/rk2818_adckey.c
+++ b/drivers/input/keyboard/rk2818_adckey.c
@@ -26,7 +26,7 @@
 
 #include <mach/adc.h>
 
-#if 1
+#if 0
 #define DBG(x...)   printk(x)
 #else
 #define DBG(x...)
diff --git a/drivers/serial/rk2818_serial.c b/drivers/serial/rk2818_serial.c
index 002e4e227f71..0c4e4c0e26ef 100644
--- a/drivers/serial/rk2818_serial.c
+++ b/drivers/serial/rk2818_serial.c
@@ -273,6 +273,7 @@ static void rk2818_serial_shutdown(struct uart_port *port)
  */
 static int rk2818_serial_startup(struct uart_port *port)
 {
+	struct rk2818_port *rk2818_port = UART_TO_RK2818(port);
 	struct tty_struct *tty = port->state->port.tty;	
 	int retval;	
 		
@@ -284,6 +285,7 @@ static int rk2818_serial_startup(struct uart_port *port)
 		rk2818_serial_shutdown(port);
 		return 	retval;
 	}	
+	clk_enable(rk2818_port->clk);
 	rk2818_uart_write(port,0xf1,UART_FCR);
 	rk2818_uart_write(port,0x01,UART_SFE);///enable fifo
     rk2818_uart_write(port,UART_IER_RECV_DATA_AVAIL_INT_ENABLE,UART_IER);  //enable uart recevice IRQ