Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: usb: Pass EHCI controller pointer to ehci_get_portsc_register()

Browse Source 
Adjust this function so that it is passed an EHCI controller pointer so that
implementations can look up their controller. This makes the weak functions
use a consistent API.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
master
Simon Glass 10 years ago
parent 11d18a1946
commit 6a1a8162c6
3 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      drivers/usb/host/ehci-faraday.c
  2. 6
      drivers/usb/host/ehci-hcd.c
  3. 2
      drivers/usb/host/ehci.h

4
drivers/usb/host/ehci-faraday.c
Unescape View File

@ -134,7 +134,7 @@ int ehci_get_port_speed(struct ehci_ctrl *ctrl, uint32_t reg)
* This ehci_get_portsc_register() overrides the weak function * This ehci_get_portsc_register() overrides the weak function
* in "ehci-hcd.c". * in "ehci-hcd.c".
*/ */
uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port) uint32_t *ehci_get_portsc_register(struct ehci_ctrl *ctrl, int port)
{ {
/* Faraday EHCI has one and only one portsc register */ /* Faraday EHCI has one and only one portsc register */
if (port) { if (port) {
@ -144,5 +144,5 @@ uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port)
} }
/* Faraday EHCI PORTSC register offset is 0x20 from hcor */ /* Faraday EHCI PORTSC register offset is 0x20 from hcor */
return (uint32_t *)((uint8_t *)hcor + 0x20); return (uint32_t *)((uint8_t *)ctrl->hcor + 0x20);
} }

6
drivers/usb/host/ehci-hcd.c
Unescape View File

@ -144,7 +144,7 @@ __weak void ehci_powerup_fixup(struct ehci_ctrl *ctrl, uint32_t *status_reg,
mdelay(50); mdelay(50);
} }
__weak uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port) __weak uint32_t *ehci_get_portsc_register(struct ehci_ctrl *ctrl, int port)
{ {
if (port < 0 || port >= CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) { if (port < 0 || port >= CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) {
/* Printing the message would cause a scan failure! */ /* Printing the message would cause a scan failure! */
@ -152,7 +152,7 @@ __weak uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port)
return NULL; return NULL;
} }
return (uint32_t *)&hcor->or_portsc[port]; return (uint32_t *)&ctrl->hcor->or_portsc[port];
} }
static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec) static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
@ -687,7 +687,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
case USB_REQ_GET_STATUS | ((USB_RT_PORT | USB_DIR_IN) << 8): case USB_REQ_GET_STATUS | ((USB_RT_PORT | USB_DIR_IN) << 8):
case USB_REQ_SET_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8): case USB_REQ_SET_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8): case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
status_reg = ehci_get_portsc_register(ctrl->hcor, port - 1); status_reg = ehci_get_portsc_register(ctrl, port - 1);
if (!status_reg) if (!status_reg)
return -1; return -1;
break; break;

2
drivers/usb/host/ehci.h
Unescape View File

@ -256,7 +256,7 @@ int ehci_get_port_speed(struct ehci_ctrl *ctrl, uint32_t reg);
void ehci_set_usbmode(struct ehci_ctrl *ctrl); void ehci_set_usbmode(struct ehci_ctrl *ctrl);
void ehci_powerup_fixup(struct ehci_ctrl *ctrl, uint32_t *status_reg, void ehci_powerup_fixup(struct ehci_ctrl *ctrl, uint32_t *status_reg,
uint32_t *reg); uint32_t *reg);
uint32_t *ehci_get_portsc_register(struct ehci_hcor *hcor, int port); uint32_t *ehci_get_portsc_register(struct ehci_ctrl *ctrl, int port);
/** /**
* ehci_set_controller_priv() - Set up private data for the controller * ehci_set_controller_priv() - Set up private data for the controller

Write Preview
Loading…
Cancel
Save