serial_mxc: Fix setup of UARTx_UFCR register

[u-boot] / common / stdio.c

diff --git a/common/stdio.c b/common/stdio.c
index adbfc890dd4d8ac907cd73b7e9c4a481bda6150a..8311ac768c90d0b0fc0b072215cfa5bd36070e2f 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -11,6 +11,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <malloc.h>
@@ -24,6 +25,8 @@
 #include <i2c.h>
 #endif
 
+#include <dm/device-internal.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct stdio_dev devs;
@@ -88,7 +91,7 @@ static void drv_system_init (void)
        memset (&dev, 0, sizeof (dev));
 
        strcpy (dev.name, "serial");
-       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
        dev.putc = stdio_serial_putc;
        dev.puts = stdio_serial_puts;
        dev.getc = stdio_serial_getc;
@@ -99,7 +102,7 @@ static void drv_system_init (void)
        memset (&dev, 0, sizeof (dev));
 
        strcpy (dev.name, "nulldev");
-       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
        dev.putc = nulldev_putc;
        dev.puts = nulldev_puts;
        dev.getc = nulldev_input;
@@ -245,6 +248,32 @@ int stdio_init_tables(void)
 
 int stdio_add_devices(void)
 {
+#ifdef CONFIG_DM_KEYBOARD
+       struct udevice *dev;
+       struct uclass *uc;
+       int ret;
+
+       /*
+        * For now we probe all the devices here. At some point this should be
+        * done only when the devices are required - e.g. we have a list of
+        * input devices to start up in the stdin environment variable. That
+        * work probably makes more sense when stdio itself is converted to
+        * driver model.
+        *
+        * TODO(sjg@chromium.org): Convert changing uclass_first_device() etc.
+        * to return the device even on error. Then we could use that here.
+        */
+       ret = uclass_get(UCLASS_KEYBOARD, &uc);
+       if (ret)
+               return ret;
+
+       /* Don't report errors to the caller - assume that they are non-fatal */
+       uclass_foreach_dev(dev, uc) {
+               ret = device_probe(dev);
+               if (ret)
+                       printf("Failed to probe keyboard '%s'\n", dev->name);
+       }
+#endif
 #ifdef CONFIG_SYS_I2C
        i2c_init_all();
 #else
@@ -258,7 +287,7 @@ int stdio_add_devices(void)
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
        drv_video_init ();
 #endif
-#ifdef CONFIG_KEYBOARD
+#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
        drv_keyboard_init ();
 #endif
 #ifdef CONFIG_LOGBUFFER