diff options
| author | amartin@nvidia.com <amartin@nvidia.com> | 2011-12-23 10:29:48 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-03 16:56:22 +0100 |
| commit | fb3ef649ed5cf3e5e73aea6ed161cdde37cb7a5f (patch) | |
| tree | 240b19bb26f28464067dc6a6fc599a51c24d226e /common/usb_kbd.c | |
| parent | d53da847cf274b8fd3ea362a3dfff68ea6206613 (diff) | |
| download | talos-obmc-uboot-fb3ef649ed5cf3e5e73aea6ed161cdde37cb7a5f.tar.gz talos-obmc-uboot-fb3ef649ed5cf3e5e73aea6ed161cdde37cb7a5f.zip | |
USB: reevaluate iomux stdin on USB kbd detect
If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
device is detected.
Signed-off-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'common/usb_kbd.c')
| -rw-r--r-- | common/usb_kbd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 2472d25d4a..960a70a43d 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -487,6 +487,11 @@ int drv_usb_kbd_init(void) if (error) return error; +#ifdef CONFIG_CONSOLE_MUX + error = iomux_doenv(stdin, stdinname); + if (error) + return error; +#else /* Check if this is the standard input device. */ if (strcmp(stdinname, DEVNAME)) return 1; @@ -498,6 +503,7 @@ int drv_usb_kbd_init(void) error = console_assign(stdin, DEVNAME); if (error) return error; +#endif return 1; } |
