Implement support for CONFIG_SERIAL_MULTI into mpc5xx serial driver.
This driver was so far only usable directly, but this patch also adds
support for the multi method. This allows using more than one serial
driver alongside the mpc5xx driver. Also, add a weak implementation
of default_serial_console() returning this driver.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>
#include <watchdog.h>
#include <command.h>
#include <mpc5xx.h>
#include <watchdog.h>
#include <command.h>
#include <mpc5xx.h>
+#include <serial.h>
+#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR;
/*
DECLARE_GLOBAL_DATA_PTR;
/*
- * Local function prototypes
-static int ready_to_send(void);
+static int ready_to_send(void)
+{
+ volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
+ volatile short status;
+
+ do {
+#if defined(CONFIG_5xx_CONS_SCI1)
+ status = immr->im_qsmcm.qsmcm_sc1sr;
+#else
+ status = immr->im_qsmcm.qsmcm_sc2sr;
+#endif
+
+#if defined(CONFIG_WATCHDOG)
+ reset_5xx_watchdog (immr);
+#endif
+ } while ((status & SCI_TDRE) == 0);
+ return 1;
+
+}
/*
* Minimal global serial functions needed to use one of the SCI modules.
*/
/*
* Minimal global serial functions needed to use one of the SCI modules.
*/
+static int mpc5xx_serial_init(void)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-void serial_putc(const char c)
+static void mpc5xx_serial_putc(const char c)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
+static int mpc5xx_serial_getc(void)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
volatile short status;
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
volatile short status;
+static int mpc5xx_serial_tstc(void)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
short status;
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
short status;
return (status & SCI_RDRF);
}
return (status & SCI_RDRF);
}
-void serial_setbrg (void)
+static void mpc5xx_serial_setbrg(void)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
short scxbr;
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
short scxbr;
-void serial_puts (const char *s)
+static void mpc5xx_serial_puts(const char *s)
{
while (*s) {
serial_putc(*s);
{
while (*s) {
serial_putc(*s);
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device mpc5xx_serial_drv = {
+ .name = "mpc5xx_serial",
+ .start = mpc5xx_serial_init,
+ .stop = NULL,
+ .setbrg = mpc5xx_serial_setbrg,
+ .putc = mpc5xx_serial_putc,
+ .puts = mpc5xx_serial_puts,
+ .getc = mpc5xx_serial_getc,
+ .tstc = mpc5xx_serial_tstc,
+};
+
+void mpc5xx_serial_initialize(void)
- volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
- volatile short status;
+ serial_register(&mpc5xx_serial_drv);
+}
- do {
-#if defined(CONFIG_5xx_CONS_SCI1)
- status = immr->im_qsmcm.qsmcm_sc1sr;
+__weak struct serial_device *default_serial_console(void)
+{
+ return &mpc5xx_serial_drv;
+}
- status = immr->im_qsmcm.qsmcm_sc2sr;
-#endif
+int serial_init(void)
+{
+ return mpc5xx_serial_init();
+}
-#if defined(CONFIG_WATCHDOG)
- reset_5xx_watchdog (immr);
-#endif
- } while ((status & SCI_TDRE) == 0);
- return 1;
+void serial_setbrg(void)
+{
+ mpc5xx_serial_setbrg();
+}
+void serial_putc(const char c)
+{
+ mpc5xx_serial_putc(c);
+
+void serial_puts(const char *s)
+{
+ mpc5xx_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+ return mpc5xx_serial_getc();
+}
+
+int serial_tstc(void)
+{
+ return mpc5xx_serial_tstc();
+}
+#endif
serial_initfunc(au1x00_serial_initialize);
serial_initfunc(asc_serial_initialize);
serial_initfunc(jz_serial_initialize);
serial_initfunc(au1x00_serial_initialize);
serial_initfunc(asc_serial_initialize);
serial_initfunc(jz_serial_initialize);
+serial_initfunc(mpc5xx_serial_initialize);
void serial_register(struct serial_device *dev)
{
void serial_register(struct serial_device *dev)
{
au1x00_serial_initialize();
asc_serial_initialize();
jz_serial_initialize();
au1x00_serial_initialize();
asc_serial_initialize();
jz_serial_initialize();
+ mpc5xx_serial_initialize();
serial_assign(default_serial_console()->name);
}
serial_assign(default_serial_console()->name);
}