From a168d3af5d9887019e62c4d4f842c79971079a0b Mon Sep 17 00:00:00 2001 From: Jagannadha Sutradharudu Teki Date: Sun, 4 Aug 2013 01:22:25 +0530 Subject: [PATCH] serial: arm_dcc: Register with serial core Register arm_dcc with drivers/serial/serial.c Signed-off-by: Jagannadha Sutradharudu Teki Signed-off-by: Michal Simek --- drivers/serial/arm_dcc.c | 33 +++++++++++++++++++++++++++------ drivers/serial/serial.c | 2 ++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c index e76c0382d8..29d929571d 100644 --- a/drivers/serial/arm_dcc.c +++ b/drivers/serial/arm_dcc.c @@ -27,6 +27,7 @@ */ #include +#include #if defined(CONFIG_CPU_V6) /* @@ -88,12 +89,12 @@ #define TIMEOUT_COUNT 0x4000000 -int arm_dcc_init(void) +static int arm_dcc_init(void) { return 0; } -int arm_dcc_getc(void) +static int arm_dcc_getc(void) { int ch; register unsigned int reg; @@ -106,7 +107,7 @@ int arm_dcc_getc(void) return ch; } -void arm_dcc_putc(char ch) +static void arm_dcc_putc(char ch) { register unsigned int reg; unsigned int timeout_count = TIMEOUT_COUNT; @@ -122,13 +123,13 @@ void arm_dcc_putc(char ch) write_dcc(ch); } -void arm_dcc_puts(const char *s) +static void arm_dcc_puts(const char *s) { while (*s) arm_dcc_putc(*s++); } -int arm_dcc_tstc(void) +static int arm_dcc_tstc(void) { register unsigned int reg; @@ -137,7 +138,27 @@ int arm_dcc_tstc(void) return reg; } +static void arm_dcc_setbrg(void) +{ +} + +static struct serial_device arm_dcc_drv = { + .name = "arm_dcc", + .start = arm_dcc_init, + .stop = NULL, + .setbrg = arm_dcc_setbrg, + .putc = arm_dcc_putc, + .puts = arm_dcc_puts, + .getc = arm_dcc_getc, + .tstc = arm_dcc_tstc, +}; + +void arm_dcc_initialize(void) +{ + serial_register(&arm_dcc_drv); +} + __weak struct serial_device *default_serial_console(void) { - return NULL; + return &arm_dcc_drv; } diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 67301355d7..118fbc305c 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -159,6 +159,7 @@ serial_initfunc(pl01x_serial_initialize); serial_initfunc(s3c44b0_serial_initialize); serial_initfunc(sa1100_serial_initialize); serial_initfunc(sh_serial_initialize); +serial_initfunc(arm_dcc_initialize); /** * serial_register() - Register serial driver with serial driver core @@ -251,6 +252,7 @@ void serial_initialize(void) s3c44b0_serial_initialize(); sa1100_serial_initialize(); sh_serial_initialize(); + arm_dcc_initialize(); serial_assign(default_serial_console()->name); } -- 2.39.2