#include <config.h>
#include <common.h>
+#include <dm.h>
#include <errno.h>
#include <stdarg.h>
#include <malloc.h>
#include <i2c.h>
#endif
+#include <dm/device-internal.h>
+
DECLARE_GLOBAL_DATA_PTR;
static struct stdio_dev devs;
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;
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;
}
list_del(&(dev->list));
+ free(dev);
/* reassign Device list */
list_for_each(pos, &(devs.list)) {
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
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
#endif
-#ifdef CONFIG_LCD
+#ifdef CONFIG_DM_VIDEO
+ struct udevice *vdev;
+# ifndef CONFIG_DM_KEYBOARD
+ int ret;
+# endif
+
+ for (ret = uclass_first_device(UCLASS_VIDEO, &vdev);
+ vdev;
+ ret = uclass_next_device(&vdev))
+ ;
+ if (ret)
+ printf("%s: Video device failed (ret=%d)\n", __func__, ret);
+#else
+# if defined(CONFIG_LCD)
drv_lcd_init ();
-#endif
-#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
+# endif
+# if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
drv_video_init ();
-#endif
-#ifdef CONFIG_KEYBOARD
+# endif
+#endif /* CONFIG_DM_VIDEO */
+#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
drv_keyboard_init ();
#endif
#ifdef CONFIG_LOGBUFFER