This patch makes it possible to change uart sleep timeout. New sysfs
entry is added (/sys/devices/platform/serial8250.0/sleep_timeout)

Also default timeout is increased to 5 second to make serial console
more usable.

Original patch was written by Tero Kristo some time ago.

Signed-off-by: Jouni Hogander <[EMAIL PROTECTED]>
---
 arch/arm/mach-omap2/serial.c |   45 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 7635038..c0a913a 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -31,7 +31,7 @@
 #include "pm.h"
 #include "prm-regbits-34xx.h"
 
-#define DEFAULT_TIMEOUT (2 * HZ)
+#define DEFAULT_TIMEOUT (5 * HZ)
 
 struct omap_uart_state {
        int num;
@@ -330,6 +330,8 @@ static irqreturn_t omap_uart_interrupt(int irq, void 
*dev_id)
        return IRQ_NONE;
 }
 
+static u32 sleep_timeout = DEFAULT_TIMEOUT;
+
 static void omap_uart_idle_init(struct omap_uart_state *uart)
 {
        u32 v;
@@ -337,7 +339,7 @@ static void omap_uart_idle_init(struct omap_uart_state 
*uart)
        int ret;
 
        uart->can_sleep = 0;
-       uart->timeout = DEFAULT_TIMEOUT;
+       uart->timeout = sleep_timeout;
        setup_timer(&uart->timer, omap_uart_idle_timer,
                    (unsigned long) uart);
        mod_timer(&uart->timer, jiffies + uart->timeout);
@@ -418,6 +420,34 @@ static void omap_uart_pm(struct uart_port *port,
                break;
        }
 }
+
+static ssize_t sleep_timeout_show(struct kobject *kobj,
+                                 struct kobj_attribute *attr,
+                                 char *buf)
+{
+       return sprintf(buf, "%u\n", sleep_timeout / HZ);
+}
+
+static ssize_t sleep_timeout_store(struct kobject *kobj,
+                                  struct kobj_attribute *attr,
+                                  const char *buf, size_t n)
+{
+       struct omap_uart_state *uart;
+       unsigned int value;
+
+       if (sscanf(buf, "%u", &value) != 1) {
+               printk(KERN_ERR "sleep_timeout_store: Invalid value\n");
+               return -EINVAL;
+       }
+       sleep_timeout = value * HZ;
+       list_for_each_entry(uart, &uart_list, node)
+               uart->timeout = sleep_timeout;
+       return n;
+}
+
+static struct kobj_attribute sleep_timeout_attr =
+       __ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store);
+
 #else
 static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
 static inline void omap_uart_pm(struct uart_port *port,
@@ -490,6 +520,15 @@ static struct platform_device serial_device = {
 
 static int __init omap_init(void)
 {
-       return platform_device_register(&serial_device);
+       int ret;
+
+       ret = platform_device_register(&serial_device);
+
+#ifdef CONFIG_PM
+       if (!ret)
+               ret = sysfs_create_file(&serial_device.dev.kobj,
+                                       &sleep_timeout_attr.attr);
+#endif
+       return ret;
 }
 arch_initcall(omap_init);
-- 
1.6.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to