Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64314
b: refs/heads/master
c: c907d3b
h: refs/heads/master
v: v3
  • Loading branch information
Mike Nuss authored and Greg Kroah-Hartman committed Aug 22, 2007
1 parent 4c1fa1a commit febb6ef
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c132e77242c130aea81c8fc64d59f573a26bf8d
refs/heads/master: c907d3b09f7a50023b61ba6ec4e01ccaa543a7ae
5 changes: 3 additions & 2 deletions trunk/drivers/usb/host/ehci-au1xxx.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*
* EHCI HCD (Host Controller Driver) for USB.
*
* (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
*
* Bus Glue for AMD Alchemy Au1xxx
*
* Based on "ohci-au1xxx.c" by Matt Porter <mporter@kernel.crashing.org>
Expand Down Expand Up @@ -196,6 +194,9 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {

/*
* basic lifecycle operations
*
* FIXME -- ehci_init() doesn't do enough here.
* See ehci-ppc-soc for a complete implementation.
*/
.reset = ehci_init,
.start = ehci_run,
Expand Down
22 changes: 20 additions & 2 deletions trunk/drivers/usb/host/ehci-ppc-soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Bus Glue for PPC On-Chip EHCI driver
* Tested on AMCC 440EPx
*
* Based on "ehci-au12xx.c" by David Brownell <dbrownell@users.sourceforge.net>
* Based on "ehci-au1xxx.c" by K.Boge <karsten.boge@amd.com>
*
* This file is licenced under the GPL.
*/
Expand All @@ -15,6 +15,24 @@

extern int usb_disabled(void);

/* called during probe() after chip reset completes */
static int ehci_ppc_soc_setup(struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
int retval;

retval = ehci_halt(ehci);
if (retval)
return retval;

retval = ehci_init(hcd);
if (retval)
return retval;

ehci->sbrn = 0x20;
return ehci_reset(ehci);
}

/**
* usb_ehci_ppc_soc_probe - initialize PPC-SoC-based HCDs
* Context: !in_interrupt()
Expand Down Expand Up @@ -120,7 +138,7 @@ static const struct hc_driver ehci_ppc_soc_hc_driver = {
/*
* basic lifecycle operations
*/
.reset = ehci_init,
.reset = ehci_ppc_soc_setup,
.start = ehci_run,
.stop = ehci_stop,
.shutdown = ehci_shutdown,
Expand Down

0 comments on commit febb6ef

Please sign in to comment.