Patchwork [U-Boot] USB: reevaluate iomux stdin on USB kbd detect

login
register
mail settings
Submitter Allen Martin
Date Dec. 23, 2011, 8:29 p.m.
Message ID <1324672188-10522-1-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/133141/
State Accepted
Commit fb3ef649ed5cf3e5e73aea6ed161cdde37cb7a5f
Delegated to: Marek Vasut
Headers show

Comments

Allen Martin - Dec. 23, 2011, 8:29 p.m.
If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
device is detected.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 common/usb_kbd.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
Allen Martin - Jan. 4, 2012, 7:07 p.m.
> If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
> device is detected.
> 
> Signed-off-by: Allen Martin <amartin@nvidia.com>

ping, anyone have any comments/feedback?

-Allen

nvpublic
Remy Bohmer - Jan. 15, 2012, 8:20 p.m.
Hi,

2011/12/23 Allen Martin <amartin@nvidia.com>:
> If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
> device is detected.
>
> Signed-off-by: Allen Martin <amartin@nvidia.com>
> ---
>  common/usb_kbd.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)

Applied to u-boot-usb. Thanks.

Kind regards,

Remy
Allen Martin - Jan. 24, 2012, 5:24 p.m.
> > If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
> > device is detected.
> >
> > Signed-off-by: Allen Martin <amartin@nvidia.com>
> 
> ping, anyone have any comments/feedback?
> 

Hi, anyone want to give this patch some love so USB keyboard can work on EHCI again?

-Allen

nvpublic
Marek Vasut - Feb. 26, 2012, 11:11 p.m.
> If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard
> device is detected.
> 
> Signed-off-by: Allen Martin <amartin@nvidia.com>
> ---

Hi,

what's the status of this patch/patchset?

Thanks
M
Allen Martin - Feb. 28, 2012, 4:31 a.m.
> Subject: Re: [U-Boot] [PATCH] 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>
> > ---
> 
> Hi,
> 
> what's the status of this patch/patchset?
> 

Both this and the keyboard polling patch have been accepted into u-boot-usb.git:

$ git log -2 u-boot-usb/master
commit b27c7b2e19a6c211d0ddca5bb62685685a36498b
Author: Allen Martin <amartin@nvidia.com>
Date:   Tue Dec 20 16:56:16 2011 -0800

    USB: move keyboard polling into kbd driver

    This moves keyboard polling logic from USB HCD drivers into USB
    keyboard driver.  Remove usb_event_poll() as keyboard polling was
    the only user of this API.  With this patch USB keyboard works with
    EHCI controllers again.  Tested on a tegra2 seaboard.

    Signed-off-by: Allen Martin <amartin@nvidia.com>

commit ce9da24a92707f0e84da901eaaa896c17c8b5630
Author: Allen Martin <amartin@nvidia.com>
Date:   Fri Dec 23 12:29:48 2011 -0800

    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>

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
Marek Vasut - Feb. 29, 2012, 9:04 p.m.
> > Subject: Re: [U-Boot] [PATCH] 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>
> > > ---
> > 
> > Hi,
> > 
> > what's the status of this patch/patchset?
> 
> Both this and the keyboard polling patch have been accepted into
> u-boot-usb.git:
> 

Which is now in quite weird state, so I picked them up too and will push them up 
once things settle.

Thanks for your fine contribution and I hope you're produce more!

M

Patch

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index e94bb7e..577a1eb 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -493,6 +493,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;
@@ -504,6 +509,7 @@  int drv_usb_kbd_init(void)
 		error = console_assign(stdin, DEVNAME);
 		if (error)
 			return error;
+#endif
 
 		return 1;
 	}