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

usb: ehci: rework to take advantage of new lowlevel interface

Browse Source 
Kill off ehci-core.h
It was used to specify some static controller data. To support more than
one controller being active at any time we have to carry the controller
data ourselfes. Change the ehci interface accordingly.

NOTE: OMAP implemented the ehci stuff a bit backwards and should be fixed
to do the same thing as other platforms. But the change for now is at least
compile clean.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Reviewed-by: Marek Vasut <marex@denx.de>
master
Lucas Stach 12 years ago committed by Tom Rini
parent c7e3b2b586
commit 676ae068d9
25 changed files with 195 additions and 216 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. 10
      arch/arm/include/asm/ehci-omap.h
  2. 6
      board/htkw/mcx/mcx.c
  3. 6
      board/technexion/twister/twister.c
  4. 6
      board/teejet/mt_ventoux/mt_ventoux.c
  5. 6
      board/ti/beagle/beagle.c
  6. 6
      board/ti/panda/panda.c
  7. 15
      drivers/usb/host/ehci-armada100.c
  8. 11
      drivers/usb/host/ehci-atmel.c
  9. 29
      drivers/usb/host/ehci-core.h
  10. 15
      drivers/usb/host/ehci-exynos.c
  11. 15
      drivers/usb/host/ehci-fsl.c
  12. 120
      drivers/usb/host/ehci-hcd.c
  13. 15
      drivers/usb/host/ehci-ixp4xx.c
  14. 15
      drivers/usb/host/ehci-marvell.c
  15. 25
      drivers/usb/host/ehci-mpc512x.c
  16. 11
      drivers/usb/host/ehci-mx5.c
  17. 11
      drivers/usb/host/ehci-mx6.c
  18. 11
      drivers/usb/host/ehci-mxc.c
  19. 20
      drivers/usb/host/ehci-mxs.c
  20. 10
      drivers/usb/host/ehci-omap.c
  21. 15
      drivers/usb/host/ehci-pci.c
  22. 11
      drivers/usb/host/ehci-ppc4xx.c
  23. 9
      drivers/usb/host/ehci-tegra.c
  24. 9
      drivers/usb/host/ehci-vct.c
  25. 4
      drivers/usb/host/ehci.h

10
arch/arm/include/asm/ehci-omap.h
Unescape View File

@ -136,7 +136,15 @@ struct omap_ehci {
u32 insreg08; /* 0xb0 */ u32 insreg08; /* 0xb0 */
}; };
int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata); /*
* FIXME: forward declaration of this structs needed because omap got the
* ehci implementation backwards. move out ehci_hcd_x from board files
*/
struct ehci_hccr;
struct ehci_hcor;
int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata,
struct ehci_hccr **hccr, struct ehci_hcor **hcor);
int omap_ehci_hcd_stop(void); int omap_ehci_hcd_stop(void);
#endif /* _OMAP_COMMON_EHCI_H_ */ #endif /* _OMAP_COMMON_EHCI_H_ */

6
board/htkw/mcx/mcx.c
Unescape View File

@ -46,12 +46,12 @@ static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
}; };
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
return omap_ehci_hcd_init(&usbhs_bdata); return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }

6
board/technexion/twister/twister.c
Unescape View File

@ -67,12 +67,12 @@ static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
}; };
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
return omap_ehci_hcd_init(&usbhs_bdata); return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }

6
board/teejet/mt_ventoux/mt_ventoux.c
Unescape View File

@ -110,12 +110,12 @@ static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
}; };
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
return omap_ehci_hcd_init(&usbhs_bdata); return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }

6
board/ti/beagle/beagle.c
Unescape View File

@ -502,12 +502,12 @@ static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED
}; };
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
return omap_ehci_hcd_init(&usbhs_bdata); return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }

6
board/ti/panda/panda.c
Unescape View File

@ -192,7 +192,7 @@ static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
}; };
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
int ret; int ret;
unsigned int utmi_clk; unsigned int utmi_clk;
@ -202,14 +202,14 @@ int ehci_hcd_init(void)
utmi_clk |= HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK; utmi_clk |= HSUSBHOST_CLKCTRL_CLKSEL_UTMI_P1_MASK;
sr32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, 0, 32, utmi_clk); sr32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, 0, 32, utmi_clk);
ret = omap_ehci_hcd_init(&usbhs_bdata); ret = omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return omap_ehci_hcd_stop(); return omap_ehci_hcd_stop();
} }

15
drivers/usb/host/ehci-armada100.c
Unescape View File

@ -31,7 +31,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <asm/arch/armada100.h> #include <asm/arch/armada100.h>
#include <asm/arch/utmi-armada100.h> #include <asm/arch/utmi-armada100.h>
@ -39,18 +38,18 @@
/* /*
* EHCI host controller init * EHCI host controller init
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
if (utmi_init() < 0) if (utmi_init() < 0)
return -1; return -1;
hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100); *hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
hcor = (struct ehci_hcor *)((uint32_t) hccr *hcor = (struct ehci_hcor *)((uint32_t) *hccr
+ HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
debug("armada100-ehci: init hccr %x and hcor %x hc_length %d\n", debug("armada100-ehci: init hccr %x and hcor %x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor, (uint32_t)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -58,7 +57,7 @@ int ehci_hcd_init(void)
/* /*
* EHCI host controller stop * EHCI host controller stop
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

11
drivers/usb/host/ehci-atmel.c
Unescape View File

@ -31,14 +31,13 @@
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
/* Enable UTMI PLL time out 500us /* Enable UTMI PLL time out 500us
* 10 times as datasheet specified * 10 times as datasheet specified
*/ */
#define EN_UPLL_TIMEOUT 500UL #define EN_UPLL_TIMEOUT 500UL
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
ulong start_time, tmp_time; ulong start_time, tmp_time;
@ -58,14 +57,14 @@ int ehci_hcd_init(void)
/* Enable USB Host clock */ /* Enable USB Host clock */
writel(1 << ATMEL_ID_UHPHS, &pmc->pcer); writel(1 << ATMEL_ID_UHPHS, &pmc->pcer);
hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI; *hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI;
hcor = (struct ehci_hcor *)((uint32_t)hccr + *hcor = (struct ehci_hcor *)((uint32_t)*hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
ulong start_time, tmp_time; ulong start_time, tmp_time;

29
drivers/usb/host/ehci-core.h
Unescape View File

@ -1,29 +0,0 @@
/*-
* Copyright (c) 2007-2008, Juniper Networks, Inc.
* Copyright (c) 2008, Excito Elektronik i Skåne AB
* All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation version 2 of
* the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef USB_EHCI_CORE_H
#define USB_EHCI_CORE_H
extern int rootdev;
extern struct ehci_hccr *hccr;
extern volatile struct ehci_hcor *hcor;
#endif

15
drivers/usb/host/ehci-exynos.c
Unescape View File

@ -27,7 +27,6 @@
#include <asm/arch/system.h> #include <asm/arch/system.h>
#include <asm/arch/power.h> #include <asm/arch/power.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
/* Setup the EHCI host controller. */ /* Setup the EHCI host controller. */
static void setup_usb_phy(struct exynos_usb_phy *usb) static void setup_usb_phy(struct exynos_usb_phy *usb)
@ -85,20 +84,20 @@ static void reset_usb_phy(struct exynos_usb_phy *usb)
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
struct exynos_usb_phy *usb; struct exynos_usb_phy *usb;
usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy(); usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy();
setup_usb_phy(usb); setup_usb_phy(usb);
hccr = (struct ehci_hccr *)samsung_get_base_usb_ehci(); *hccr = (struct ehci_hccr *)samsung_get_base_usb_ehci();
hcor = (struct ehci_hcor *)((uint32_t) hccr *hcor = (struct ehci_hcor *)((uint32_t) *hccr
+ HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
debug("Exynos5-ehci: init hccr %x and hcor %x hc_length %d\n", debug("Exynos5-ehci: init hccr %x and hcor %x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor, (uint32_t)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -107,7 +106,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the EHCI host controller. * the EHCI host controller.
*/ */
int ehci_hcd_stop() int ehci_hcd_stop(int index)
{ {
struct exynos_usb_phy *usb; struct exynos_usb_phy *usb;

15
drivers/usb/host/ehci-fsl.c
Unescape View File

@ -29,7 +29,6 @@
#include <hwconfig.h> #include <hwconfig.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
/* /*
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
@ -37,7 +36,7 @@
* *
* Excerpts from linux ehci fsl driver. * Excerpts from linux ehci fsl driver.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
struct usb_ehci *ehci; struct usb_ehci *ehci;
const char *phy_type = NULL; const char *phy_type = NULL;
@ -49,9 +48,9 @@ int ehci_hcd_init(void)
#endif #endif
ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
/* Set to Host mode */ /* Set to Host mode */
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);
@ -82,14 +81,14 @@ int ehci_hcd_init(void)
setbits_be32(&ehci->control, UTMI_PHY_EN); setbits_be32(&ehci->control, UTMI_PHY_EN);
udelay(1000); /* delay required for PHY Clk to appear */ udelay(1000); /* delay required for PHY Clk to appear */
#endif #endif
out_le32(&(hcor->or_portsc[0]), PORT_PTS_UTMI); out_le32(&(*hcor)->or_portsc[0], PORT_PTS_UTMI);
} else { } else {
#if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY) #if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY)
clrbits_be32(&ehci->control, UTMI_PHY_EN); clrbits_be32(&ehci->control, UTMI_PHY_EN);
setbits_be32(&ehci->control, PHY_CLK_SEL_ULPI); setbits_be32(&ehci->control, PHY_CLK_SEL_ULPI);
udelay(1000); /* delay required for PHY Clk to appear */ udelay(1000); /* delay required for PHY Clk to appear */
#endif #endif
out_le32(&(hcor->or_portsc[0]), PORT_PTS_ULPI); out_le32(&(*hcor)->or_portsc[0], PORT_PTS_ULPI);
} }
/* Enable interface. */ /* Enable interface. */
@ -108,7 +107,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

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

@ -30,12 +30,17 @@
#include "ehci.h" #include "ehci.h"
int rootdev; #ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
struct ehci_hccr *hccr; /* R/O registers, not need for volatile */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
volatile struct ehci_hcor *hcor; #endif
static uint16_t portreset; static struct ehci_ctrl {
DEFINE_ALIGN_BUFFER(struct QH, qh_list, 1, USB_DMA_MINALIGN); struct ehci_hccr *hccr; /* R/O registers, not need for volatile */
struct ehci_hcor *hcor;
int rootdev;
uint16_t portreset;
struct QH qh_list __attribute__((aligned(USB_DMA_MINALIGN)));
} ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT];
#define ALIGN_END_ADDR(type, ptr, size) \ #define ALIGN_END_ADDR(type, ptr, size) \
((uint32_t)(ptr) + roundup((size) * sizeof(type), USB_DMA_MINALIGN)) ((uint32_t)(ptr) + roundup((size) * sizeof(type), USB_DMA_MINALIGN))
@ -136,24 +141,25 @@ static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
return -1; return -1;
} }
static int ehci_reset(void) static int ehci_reset(int index)
{ {
uint32_t cmd; uint32_t cmd;
uint32_t tmp; uint32_t tmp;
uint32_t *reg_ptr; uint32_t *reg_ptr;
int ret = 0; int ret = 0;
cmd = ehci_readl(&hcor->or_usbcmd); cmd = ehci_readl(&ehcic[index].hcor->or_usbcmd);
cmd = (cmd & ~CMD_RUN) | CMD_RESET; cmd = (cmd & ~CMD_RUN) | CMD_RESET;
ehci_writel(&hcor->or_usbcmd, cmd); ehci_writel(&ehcic[index].hcor->or_usbcmd, cmd);
ret = handshake((uint32_t *)&hcor->or_usbcmd, CMD_RESET, 0, 250 * 1000); ret = handshake((uint32_t *)&ehcic[index].hcor->or_usbcmd,
CMD_RESET, 0, 250 * 1000);
if (ret < 0) { if (ret < 0) {
printf("EHCI fail to reset\n"); printf("EHCI fail to reset\n");
goto out; goto out;
} }
if (ehci_is_TDI()) { if (ehci_is_TDI()) {
reg_ptr = (uint32_t *)((u8 *)hcor + USBMODE); reg_ptr = (uint32_t *)((u8 *)ehcic[index].hcor + USBMODE);
tmp = ehci_readl(reg_ptr); tmp = ehci_readl(reg_ptr);
tmp |= USBMODE_CM_HC; tmp |= USBMODE_CM_HC;
#if defined(CONFIG_EHCI_MMIO_BIG_ENDIAN) #if defined(CONFIG_EHCI_MMIO_BIG_ENDIAN)
@ -163,10 +169,10 @@ static int ehci_reset(void)
} }
#ifdef CONFIG_USB_EHCI_TXFIFO_THRESH #ifdef CONFIG_USB_EHCI_TXFIFO_THRESH
cmd = ehci_readl(&hcor->or_txfilltuning); cmd = ehci_readl(&ehcic[index].hcor->or_txfilltuning);
cmd &= ~TXFIFO_THRESH_MASK; cmd &= ~TXFIFO_THRESH_MASK;
cmd |= TXFIFO_THRESH(CONFIG_USB_EHCI_TXFIFO_THRESH); cmd |= TXFIFO_THRESH(CONFIG_USB_EHCI_TXFIFO_THRESH);
ehci_writel(&hcor->or_txfilltuning, cmd); ehci_writel(&ehcic[index].hcor->or_txfilltuning, cmd);
#endif #endif
out: out:
return ret; return ret;
@ -212,7 +218,6 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
struct qTD *qtd; struct qTD *qtd;
int qtd_count = 0; int qtd_count = 0;
int qtd_counter = 0; int qtd_counter = 0;
volatile struct qTD *vtd; volatile struct qTD *vtd;
unsigned long ts; unsigned long ts;
uint32_t *tdp; uint32_t *tdp;
@ -221,6 +226,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
uint32_t cmd; uint32_t cmd;
int timeout; int timeout;
int ret = 0; int ret = 0;
struct ehci_ctrl *ctrl = dev->controller;
debug("dev=%p, pipe=%lx, buffer=%p, length=%d, req=%p\n", dev, pipe, debug("dev=%p, pipe=%lx, buffer=%p, length=%d, req=%p\n", dev, pipe,
buffer, length, req); buffer, length, req);
@ -311,7 +317,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
* qh_overlay.qt_next ...... 13-10 H * qh_overlay.qt_next ...... 13-10 H
* - qh_overlay.qt_altnext * - qh_overlay.qt_altnext
*/ */
qh->qh_link = cpu_to_hc32((uint32_t)qh_list | QH_LINK_TYPE_QH); qh->qh_link = cpu_to_hc32((uint32_t)&ctrl->qh_list | QH_LINK_TYPE_QH);
c = usb_pipespeed(pipe) != USB_SPEED_HIGH && !usb_pipeendpoint(pipe); c = usb_pipespeed(pipe) != USB_SPEED_HIGH && !usb_pipeendpoint(pipe);
maxpacket = usb_maxpacket(dev, pipe); maxpacket = usb_maxpacket(dev, pipe);
endpt = QH_ENDPT1_RL(8) | QH_ENDPT1_C(c) | endpt = QH_ENDPT1_RL(8) | QH_ENDPT1_C(c) |
@ -445,27 +451,27 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
tdp = &qtd[qtd_counter++].qt_next; tdp = &qtd[qtd_counter++].qt_next;
} }
qh_list->qh_link = cpu_to_hc32((uint32_t)qh | QH_LINK_TYPE_QH); ctrl->qh_list.qh_link = cpu_to_hc32((uint32_t)qh | QH_LINK_TYPE_QH);
/* Flush dcache */ /* Flush dcache */
flush_dcache_range((uint32_t)qh_list, flush_dcache_range((uint32_t)&ctrl->qh_list,
ALIGN_END_ADDR(struct QH, qh_list, 1)); ALIGN_END_ADDR(struct QH, &ctrl->qh_list, 1));
flush_dcache_range((uint32_t)qh, ALIGN_END_ADDR(struct QH, qh, 1)); flush_dcache_range((uint32_t)qh, ALIGN_END_ADDR(struct QH, qh, 1));
flush_dcache_range((uint32_t)qtd, flush_dcache_range((uint32_t)qtd,
ALIGN_END_ADDR(struct qTD, qtd, qtd_count)); ALIGN_END_ADDR(struct qTD, qtd, qtd_count));
/* Set async. queue head pointer. */ /* Set async. queue head pointer. */
ehci_writel(&hcor->or_asynclistaddr, (uint32_t)qh_list); ehci_writel(&ctrl->hcor->or_asynclistaddr, (uint32_t)&ctrl->qh_list);
usbsts = ehci_readl(&hcor->or_usbsts); usbsts = ehci_readl(&ctrl->hcor->or_usbsts);
ehci_writel(&hcor->or_usbsts, (usbsts & 0x3f)); ehci_writel(&ctrl->hcor->or_usbsts, (usbsts & 0x3f));
/* Enable async. schedule. */ /* Enable async. schedule. */
cmd = ehci_readl(&hcor->or_usbcmd); cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
cmd |= CMD_ASE; cmd |= CMD_ASE;
ehci_writel(&hcor->or_usbcmd, cmd); ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
ret = handshake((uint32_t *)&hcor->or_usbsts, STS_ASS, STS_ASS, ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, STS_ASS,
100 * 1000); 100 * 1000);
if (ret < 0) { if (ret < 0) {
printf("EHCI fail timeout STS_ASS set\n"); printf("EHCI fail timeout STS_ASS set\n");
@ -478,8 +484,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
timeout = USB_TIMEOUT_MS(pipe); timeout = USB_TIMEOUT_MS(pipe);
do { do {
/* Invalidate dcache */ /* Invalidate dcache */
invalidate_dcache_range((uint32_t)qh_list, invalidate_dcache_range((uint32_t)&ctrl->qh_list,
ALIGN_END_ADDR(struct QH, qh_list, 1)); ALIGN_END_ADDR(struct QH, &ctrl->qh_list, 1));
invalidate_dcache_range((uint32_t)qh, invalidate_dcache_range((uint32_t)qh,
ALIGN_END_ADDR(struct QH, qh, 1)); ALIGN_END_ADDR(struct QH, qh, 1));
invalidate_dcache_range((uint32_t)qtd, invalidate_dcache_range((uint32_t)qtd,
@ -508,11 +514,11 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
printf("EHCI timed out on TD - token=%#x\n", token); printf("EHCI timed out on TD - token=%#x\n", token);
/* Disable async schedule. */ /* Disable async schedule. */
cmd = ehci_readl(&hcor->or_usbcmd); cmd = ehci_readl(&ctrl->hcor->or_usbcmd);
cmd &= ~CMD_ASE; cmd &= ~CMD_ASE;
ehci_writel(&hcor->or_usbcmd, cmd); ehci_writel(&ctrl->hcor->or_usbcmd, cmd);
ret = handshake((uint32_t *)&hcor->or_usbsts, STS_ASS, 0, ret = handshake((uint32_t *)&ctrl->hcor->or_usbsts, STS_ASS, 0,
100 * 1000); 100 * 1000);
if (ret < 0) { if (ret < 0) {
printf("EHCI fail timeout STS_ASS reset\n"); printf("EHCI fail timeout STS_ASS reset\n");
@ -551,9 +557,9 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
} else { } else {
dev->act_len = 0; dev->act_len = 0;
debug("dev=%u, usbsts=%#x, p[1]=%#x, p[2]=%#x\n", debug("dev=%u, usbsts=%#x, p[1]=%#x, p[2]=%#x\n",
dev->devnum, ehci_readl(&hcor->or_usbsts), dev->devnum, ehci_readl(&ctrl->hcor->or_usbsts),
ehci_readl(&hcor->or_portsc[0]), ehci_readl(&ctrl->hcor->or_portsc[0]),
ehci_readl(&hcor->or_portsc[1])); ehci_readl(&ctrl->hcor->or_portsc[1]));
} }
free(qtd); free(qtd);
@ -584,13 +590,14 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
int len, srclen; int len, srclen;
uint32_t reg; uint32_t reg;
uint32_t *status_reg; uint32_t *status_reg;
struct ehci_ctrl *ctrl = dev->controller;
if (le16_to_cpu(req->index) > CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) { if (le16_to_cpu(req->index) > CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) {
printf("The request port(%d) is not configured\n", printf("The request port(%d) is not configured\n",
le16_to_cpu(req->index) - 1); le16_to_cpu(req->index) - 1);
return -1; return -1;
} }
status_reg = (uint32_t *)&hcor->or_portsc[ status_reg = (uint32_t *)&ctrl->hcor->or_portsc[
le16_to_cpu(req->index) - 1]; le16_to_cpu(req->index) - 1];
srclen = 0; srclen = 0;
@ -658,7 +665,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
break; break;
case USB_REQ_SET_ADDRESS | (USB_RECIP_DEVICE << 8): case USB_REQ_SET_ADDRESS | (USB_RECIP_DEVICE << 8):
debug("USB_REQ_SET_ADDRESS\n"); debug("USB_REQ_SET_ADDRESS\n");
rootdev = le16_to_cpu(req->value); ctrl->rootdev = le16_to_cpu(req->value);
break; break;
case DeviceOutRequest | USB_REQ_SET_CONFIGURATION: case DeviceOutRequest | USB_REQ_SET_CONFIGURATION:
debug("USB_REQ_SET_CONFIGURATION\n"); debug("USB_REQ_SET_CONFIGURATION\n");
@ -708,7 +715,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
tmpbuf[2] |= USB_PORT_STAT_C_ENABLE; tmpbuf[2] |= USB_PORT_STAT_C_ENABLE;
if (reg & EHCI_PS_OCC) if (reg & EHCI_PS_OCC)
tmpbuf[2] |= USB_PORT_STAT_C_OVERCURRENT; tmpbuf[2] |= USB_PORT_STAT_C_OVERCURRENT;
if (portreset & (1 << le16_to_cpu(req->index))) if (ctrl->portreset & (1 << le16_to_cpu(req->index)))
tmpbuf[2] |= USB_PORT_STAT_C_RESET; tmpbuf[2] |= USB_PORT_STAT_C_RESET;
srcptr = tmpbuf; srcptr = tmpbuf;
@ -723,7 +730,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
ehci_writel(status_reg, reg); ehci_writel(status_reg, reg);
break; break;
case USB_PORT_FEAT_POWER: case USB_PORT_FEAT_POWER:
if (HCS_PPC(ehci_readl(&hccr->cr_hcsparams))) { if (HCS_PPC(ehci_readl(&ctrl->hccr->cr_hcsparams))) {
reg |= EHCI_PS_PP; reg |= EHCI_PS_PP;
ehci_writel(status_reg, reg); ehci_writel(status_reg, reg);
} }
@ -760,7 +767,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
ret = handshake(status_reg, EHCI_PS_PR, 0, ret = handshake(status_reg, EHCI_PS_PR, 0,
2 * 1000); 2 * 1000);
if (!ret) if (!ret)
portreset |= ctrl->portreset |=
1 << le16_to_cpu(req->index); 1 << le16_to_cpu(req->index);
else else
printf("port(%d) reset error\n", printf("port(%d) reset error\n",
@ -772,7 +779,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
goto unknown; goto unknown;
} }
/* unblock posted writes */ /* unblock posted writes */
(void) ehci_readl(&hcor->or_usbcmd); (void) ehci_readl(&ctrl->hcor->or_usbcmd);
break; break;
case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8): case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
reg = ehci_readl(status_reg); reg = ehci_readl(status_reg);
@ -784,7 +791,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_PE; reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_PE;
break; break;
case USB_PORT_FEAT_POWER: case USB_PORT_FEAT_POWER:
if (HCS_PPC(ehci_readl(&hccr->cr_hcsparams))) if (HCS_PPC(ehci_readl(&ctrl->hccr->cr_hcsparams)))
reg = reg & ~(EHCI_PS_CLEAR | EHCI_PS_PP); reg = reg & ~(EHCI_PS_CLEAR | EHCI_PS_PP);
case USB_PORT_FEAT_C_CONNECTION: case USB_PORT_FEAT_C_CONNECTION:
reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_CSC; reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_CSC;
@ -793,7 +800,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_OCC; reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_OCC;
break; break;
case USB_PORT_FEAT_C_RESET: case USB_PORT_FEAT_C_RESET:
portreset &= ~(1 << le16_to_cpu(req->index)); ctrl->portreset &= ~(1 << le16_to_cpu(req->index));
break; break;
default: default:
debug("unknown feature %x\n", le16_to_cpu(req->value)); debug("unknown feature %x\n", le16_to_cpu(req->value));
@ -801,7 +808,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
} }
ehci_writel(status_reg, reg); ehci_writel(status_reg, reg);
/* unblock posted write */ /* unblock posted write */
(void) ehci_readl(&hcor->or_usbcmd); (void) ehci_readl(&ctrl->hcor->or_usbcmd);
break; break;
default: default:
debug("Unknown request\n"); debug("Unknown request\n");
@ -831,26 +838,29 @@ unknown:
int usb_lowlevel_stop(int index) int usb_lowlevel_stop(int index)
{ {
return ehci_hcd_stop(); return ehci_hcd_stop(index);
} }
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, void **controller)
{ {
uint32_t reg; uint32_t reg;
uint32_t cmd; uint32_t cmd;
struct QH *qh_list;
if (ehci_hcd_init()) if (ehci_hcd_init(index, &ehcic[index].hccr, &ehcic[index].hcor))
return -1; return -1;
/* EHCI spec section 4.1 */ /* EHCI spec section 4.1 */
if (ehci_reset()) if (ehci_reset(index))
return -1; return -1;
#if defined(CONFIG_EHCI_HCD_INIT_AFTER_RESET) #if defined(CONFIG_EHCI_HCD_INIT_AFTER_RESET)
if (ehci_hcd_init()) if (ehci_hcd_init(index, &ehcic[index].hccr, &ehcic[index].hcor))
return -1; return -1;
#endif #endif
qh_list = &ehcic[index].qh_list;
/* Set head of reclaim list */ /* Set head of reclaim list */
memset(qh_list, 0, sizeof(*qh_list)); memset(qh_list, 0, sizeof(*qh_list));
qh_list->qh_link = cpu_to_hc32((uint32_t)qh_list | QH_LINK_TYPE_QH); qh_list->qh_link = cpu_to_hc32((uint32_t)qh_list | QH_LINK_TYPE_QH);
@ -862,7 +872,7 @@ int usb_lowlevel_init(int index, void **controller)
qh_list->qh_overlay.qt_token = qh_list->qh_overlay.qt_token =
cpu_to_hc32(QT_TOKEN_STATUS(QT_TOKEN_STATUS_HALTED)); cpu_to_hc32(QT_TOKEN_STATUS(QT_TOKEN_STATUS_HALTED));
reg = ehci_readl(&hccr->cr_hcsparams); reg = ehci_readl(&ehcic[index].hccr->cr_hcsparams);
descriptor.hub.bNbrPorts = HCS_N_PORTS(reg); descriptor.hub.bNbrPorts = HCS_N_PORTS(reg);
printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts); printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts);
/* Port Indicators */ /* Port Indicators */
@ -875,27 +885,28 @@ int usb_lowlevel_init(int index, void **controller)
| 0x01, &descriptor.hub.wHubCharacteristics); | 0x01, &descriptor.hub.wHubCharacteristics);
/* Start the host controller. */ /* Start the host controller. */
cmd = ehci_readl(&hcor->or_usbcmd); cmd = ehci_readl(&ehcic[index].hcor->or_usbcmd);
/* /*
* Philips, Intel, and maybe others need CMD_RUN before the * Philips, Intel, and maybe others need CMD_RUN before the
* root hub will detect new devices (why?); NEC doesn't * root hub will detect new devices (why?); NEC doesn't
*/ */
cmd &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET); cmd &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
cmd |= CMD_RUN; cmd |= CMD_RUN;
ehci_writel(&hcor->or_usbcmd, cmd); ehci_writel(&ehcic[index].hcor->or_usbcmd, cmd);
/* take control over the ports */ /* take control over the ports */
cmd = ehci_readl(&hcor->or_configflag); cmd = ehci_readl(&ehcic[index].hcor->or_configflag);
cmd |= FLAG_CF; cmd |= FLAG_CF;
ehci_writel(&hcor->or_configflag, cmd); ehci_writel(&ehcic[index].hcor->or_configflag, cmd);
/* unblock posted write */ /* unblock posted write */
cmd = ehci_readl(&hcor->or_usbcmd); cmd = ehci_readl(&ehcic[index].hcor->or_usbcmd);
mdelay(5); mdelay(5);
reg = HC_VERSION(ehci_readl(&hccr->cr_capbase)); reg = HC_VERSION(ehci_readl(&ehcic[index].hccr->cr_capbase));
printf("USB EHCI %x.%02x\n", reg >> 8, reg & 0xff); printf("USB EHCI %x.%02x\n", reg >> 8, reg & 0xff);
rootdev = 0; ehcic[index].rootdev = 0;
*controller = &ehcic[index];
return 0; return 0;
} }
@ -915,14 +926,15 @@ int
submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
int length, struct devrequest *setup) int length, struct devrequest *setup)
{ {
struct ehci_ctrl *ctrl = dev->controller;
if (usb_pipetype(pipe) != PIPE_CONTROL) { if (usb_pipetype(pipe) != PIPE_CONTROL) {
debug("non-control pipe (type=%lu)", usb_pipetype(pipe)); debug("non-control pipe (type=%lu)", usb_pipetype(pipe));
return -1; return -1;
} }
if (usb_pipedevice(pipe) == rootdev) { if (usb_pipedevice(pipe) == ctrl->rootdev) {
if (!rootdev) if (!ctrl->rootdev)
dev->speed = USB_SPEED_HIGH; dev->speed = USB_SPEED_HIGH;
return ehci_submit_root(dev, pipe, buffer, length, setup); return ehci_submit_root(dev, pipe, buffer, length, setup);
} }

15
drivers/usb/host/ehci-ixp4xx.c
Unescape View File

@ -23,20 +23,19 @@
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
/* /*
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
hccr = (struct ehci_hccr *)(0xcd000100); *hccr = (struct ehci_hccr *)(0xcd000100);
hcor = (struct ehci_hcor *)((uint32_t) hccr *hcor = (struct ehci_hcor *)((uint32_t) *hccr
+ HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
printf("IXP4XX init hccr %x and hcor %x hc_length %d\n", printf("IXP4XX init hccr %x and hcor %x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor, (uint32_t)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -44,7 +43,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

15
drivers/usb/host/ehci-marvell.c
Unescape View File

@ -26,7 +26,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_KIRKWOOD)
@ -91,17 +90,17 @@ static void usb_brg_adrdec_setup(void)
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
usb_brg_adrdec_setup(); usb_brg_adrdec_setup();
hccr = (struct ehci_hccr *)(MVUSB0_BASE + 0x100); *hccr = (struct ehci_hccr *)(MVUSB0_BASE + 0x100);
hcor = (struct ehci_hcor *)((uint32_t) hccr *hcor = (struct ehci_hcor *)((uint32_t) *hccr
+ HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
debug("ehci-marvell: init hccr %x and hcor %x hc_length %d\n", debug("ehci-marvell: init hccr %x and hcor %x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor, (uint32_t)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -110,7 +109,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

25
drivers/usb/host/ehci-mpc512x.c
Unescape View File

@ -33,7 +33,6 @@
#include <usb/ehci-fsl.h> #include <usb/ehci-fsl.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
static void fsl_setup_phy(volatile struct ehci_hcor *); static void fsl_setup_phy(volatile struct ehci_hcor *);
static void fsl_platform_set_host_mode(volatile struct usb_ehci *ehci); static void fsl_platform_set_host_mode(volatile struct usb_ehci *ehci);
@ -46,21 +45,21 @@ static void usb_platform_dr_init(volatile struct usb_ehci *ehci);
* This code is derived from EHCI FSL USB Linux driver for MPC5121 * This code is derived from EHCI FSL USB Linux driver for MPC5121
* *
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
volatile struct usb_ehci *ehci; volatile struct usb_ehci *ehci;
/* Hook the memory mapped registers for EHCI-Controller */ /* Hook the memory mapped registers for EHCI-Controller */
ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength)); *hccr = (struct ehci_hccr *)((uint32_t)&(ehci->caplength));
hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
/* configure interface for UTMI_WIDE */ /* configure interface for UTMI_WIDE */
usb_platform_dr_init(ehci); usb_platform_dr_init(ehci);
/* Init Phy USB0 to UTMI+ */ /* Init Phy USB0 to UTMI+ */
fsl_setup_phy(hcor); fsl_setup_phy(*hcor);
/* Set to host mode */ /* Set to host mode */
fsl_platform_set_host_mode(ehci); fsl_platform_set_host_mode(ehci);
@ -89,20 +88,14 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
volatile struct usb_ehci *ehci; volatile struct usb_ehci *ehci;
int exit_status = 0; int exit_status = 0;
if (hcor) { /* Reset the USB controller */
/* Unhook struct */ ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
hccr = NULL; exit_status = reset_usb_controller(ehci);
hcor = NULL;
/* Reset the USB controller */
ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;
exit_status = reset_usb_controller(ehci);
}
return exit_status; return exit_status;
} }

11
drivers/usb/host/ehci-mx5.c
Unescape View File

@ -25,7 +25,6 @@
#include <asm/arch/iomux.h> #include <asm/arch/iomux.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#define MX5_USBOTHER_REGS_OFFSET 0x800 #define MX5_USBOTHER_REGS_OFFSET 0x800
@ -206,7 +205,7 @@ void __board_ehci_hcd_postinit(struct usb_ehci *ehci, int port)
void board_ehci_hcd_postinit(struct usb_ehci *ehci, int port) void board_ehci_hcd_postinit(struct usb_ehci *ehci, int port)
__attribute((weak, alias("__board_ehci_hcd_postinit"))); __attribute((weak, alias("__board_ehci_hcd_postinit")));
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
struct usb_ehci *ehci; struct usb_ehci *ehci;
#ifdef CONFIG_MX53 #ifdef CONFIG_MX53
@ -230,9 +229,9 @@ int ehci_hcd_init(void)
ehci = (struct usb_ehci *)(OTG_BASE_ADDR + ehci = (struct usb_ehci *)(OTG_BASE_ADDR +
(0x200 * CONFIG_MXC_USB_PORT)); (0x200 * CONFIG_MXC_USB_PORT));
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
hcor = (struct ehci_hcor *)((uint32_t)hccr + *hcor = (struct ehci_hcor *)((uint32_t)*hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);
__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
@ -247,7 +246,7 @@ int ehci_hcd_init(void)
return 0; return 0;
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

11
drivers/usb/host/ehci-mx6.c
Unescape View File

@ -25,7 +25,6 @@
#include <asm/imx-common/iomux-v3.h> #include <asm/imx-common/iomux-v3.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#define USB_OTGREGS_OFFSET 0x000 #define USB_OTGREGS_OFFSET 0x000
#define USB_H1REGS_OFFSET 0x200 #define USB_H1REGS_OFFSET 0x200
@ -160,7 +159,7 @@ static void usbh1_oc_config(void)
__raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET); __raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET);
} }
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
struct usb_ehci *ehci; struct usb_ehci *ehci;
@ -182,9 +181,9 @@ int ehci_hcd_init(void)
ehci = (struct usb_ehci *)(USBOH3_USB_BASE_ADDR + ehci = (struct usb_ehci *)(USBOH3_USB_BASE_ADDR +
(0x200 * CONFIG_MXC_USB_PORT)); (0x200 * CONFIG_MXC_USB_PORT));
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
hcor = (struct ehci_hcor *)((uint32_t)hccr + *hcor = (struct ehci_hcor *)((uint32_t)*hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);
__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
@ -195,7 +194,7 @@ int ehci_hcd_init(void)
return 0; return 0;
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

11
drivers/usb/host/ehci-mxc.c
Unescape View File

@ -25,7 +25,6 @@
#include <errno.h> #include <errno.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#define USBCTRL_OTGBASE_OFFSET 0x600 #define USBCTRL_OTGBASE_OFFSET 0x600
@ -106,7 +105,7 @@ static int mxc_set_usbcontrol(int port, unsigned int flags)
return 0; return 0;
} }
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
struct usb_ehci *ehci; struct usb_ehci *ehci;
#ifdef CONFIG_MX31 #ifdef CONFIG_MX31
@ -121,9 +120,9 @@ int ehci_hcd_init(void)
ehci = (struct usb_ehci *)(IMX_USB_BASE + ehci = (struct usb_ehci *)(IMX_USB_BASE +
(0x200 * CONFIG_MXC_USB_PORT)); (0x200 * CONFIG_MXC_USB_PORT));
hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); *hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength);
hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);
__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS); mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS);
@ -137,7 +136,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

20
drivers/usb/host/ehci-mxs.c
Unescape View File

@ -27,7 +27,6 @@
#include <asm/arch/regs-usb.h> #include <asm/arch/regs-usb.h>
#include <asm/arch/regs-usbphy.h> #include <asm/arch/regs-usbphy.h>
#include "ehci-core.h"
#include "ehci.h" #include "ehci.h"
#if (CONFIG_EHCI_MXS_PORT != 0) && (CONFIG_EHCI_MXS_PORT != 1) #if (CONFIG_EHCI_MXS_PORT != 0) && (CONFIG_EHCI_MXS_PORT != 1)
@ -70,7 +69,7 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)
#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) #define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2)
#define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16)
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
int ret; int ret;
@ -107,28 +106,35 @@ int ehci_hcd_init(void)
&ehci_mxs.phy_regs->hw_usbphy_ctrl_set); &ehci_mxs.phy_regs->hw_usbphy_ctrl_set);
usb_base = ((uint32_t)ehci_mxs.usb_regs) + 0x100; usb_base = ((uint32_t)ehci_mxs.usb_regs) + 0x100;
hccr = (struct ehci_hccr *)usb_base; *hccr = (struct ehci_hccr *)usb_base;
cap_base = ehci_readl(&hccr->cr_capbase); cap_base = ehci_readl(&(*hccr)->cr_capbase);
hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base)); *hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base));
return 0; return 0;
} }
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
int ret; int ret;
uint32_t tmp; uint32_t usb_base, cap_base, tmp;
struct mxs_register_32 *digctl_ctrl = struct mxs_register_32 *digctl_ctrl =
(struct mxs_register_32 *)HW_DIGCTL_CTRL; (struct mxs_register_32 *)HW_DIGCTL_CTRL;
struct mxs_clkctrl_regs *clkctrl_regs = struct mxs_clkctrl_regs *clkctrl_regs =
(struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE; (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
ret = mxs_ehci_get_port(&ehci_mxs, CONFIG_EHCI_MXS_PORT); ret = mxs_ehci_get_port(&ehci_mxs, CONFIG_EHCI_MXS_PORT);
if (ret) if (ret)
return ret; return ret;
/* Stop the USB port */ /* Stop the USB port */
usb_base = ((uint32_t)ehci_mxs.usb_regs) + 0x100;
hccr = (struct ehci_hccr *)usb_base;
cap_base = ehci_readl(&hccr->cr_capbase);
hcor = (struct ehci_hcor *)(usb_base + HC_LENGTH(cap_base));
tmp = ehci_readl(&hcor->or_usbcmd); tmp = ehci_readl(&hcor->or_usbcmd);
tmp &= ~CMD_RUN; tmp &= ~CMD_RUN;
ehci_writel(tmp, &hcor->or_usbcmd); ehci_writel(tmp, &hcor->or_usbcmd);

10
drivers/usb/host/ehci-omap.c
Unescape View File

@ -33,7 +33,8 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/arch/ehci.h> #include <asm/arch/ehci.h>
#include <asm/ehci-omap.h> #include <asm/ehci-omap.h>
#include "ehci-core.h"
#include "ehci.h"
static struct omap_uhh *const uhh = (struct omap_uhh *)OMAP_UHH_BASE; static struct omap_uhh *const uhh = (struct omap_uhh *)OMAP_UHH_BASE;
static struct omap_usbtll *const usbtll = (struct omap_usbtll *)OMAP_USBTLL_BASE; static struct omap_usbtll *const usbtll = (struct omap_usbtll *)OMAP_USBTLL_BASE;
@ -155,7 +156,8 @@ int omap_ehci_hcd_stop(void)
* Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1 * Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1
* See there for additional Copyrights. * See there for additional Copyrights.
*/ */
int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata) int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
int ret; int ret;
unsigned int i, reg = 0, rev = 0; unsigned int i, reg = 0, rev = 0;
@ -246,8 +248,8 @@ int omap_ehci_hcd_init(struct omap_usbhs_board_data *usbhs_pdata)
if (is_ehci_phy_mode(usbhs_pdata->port_mode[i])) if (is_ehci_phy_mode(usbhs_pdata->port_mode[i]))
omap_ehci_soft_phy_reset(i); omap_ehci_soft_phy_reset(i);
hccr = (struct ehci_hccr *)(OMAP_EHCI_BASE); *hccr = (struct ehci_hccr *)(OMAP_EHCI_BASE);
hcor = (struct ehci_hcor *)(OMAP_EHCI_BASE + 0x10); *hcor = (struct ehci_hcor *)(OMAP_EHCI_BASE + 0x10);
debug("OMAP EHCI init done\n"); debug("OMAP EHCI init done\n");
return 0; return 0;

15
drivers/usb/host/ehci-pci.c
Unescape View File

@ -23,7 +23,6 @@
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#ifdef CONFIG_PCI_EHCI_DEVICE #ifdef CONFIG_PCI_EHCI_DEVICE
static struct pci_device_id ehci_pci_ids[] = { static struct pci_device_id ehci_pci_ids[] = {
@ -39,7 +38,7 @@ static struct pci_device_id ehci_pci_ids[] = {
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
pci_dev_t pdev; pci_dev_t pdev;
@ -49,14 +48,14 @@ int ehci_hcd_init(void)
return -1; return -1;
} }
hccr = (struct ehci_hccr *)pci_map_bar(pdev, *hccr = (struct ehci_hccr *)pci_map_bar(pdev,
PCI_BASE_ADDRESS_0, PCI_REGION_MEM); PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
debug("EHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n", debug("EHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor, (uint32_t)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -65,7 +64,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

11
drivers/usb/host/ehci-ppc4xx.c
Unescape View File

@ -23,17 +23,16 @@
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
/* /*
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
hccr = (struct ehci_hccr *)(CONFIG_SYS_PPC4XX_USB_ADDR); *hccr = (struct ehci_hccr *)(CONFIG_SYS_PPC4XX_USB_ADDR);
hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
HC_LENGTH(ehci_readl(&hccr->cr_capbase))); HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
return 0; return 0;
} }
@ -41,7 +40,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

9
drivers/usb/host/ehci-tegra.c
Unescape View File

@ -24,7 +24,6 @@
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/arch/usb.h> #include <asm/arch/usb.h>
@ -50,7 +49,7 @@ void ehci_powerup_fixup(uint32_t *status_reg, uint32_t *reg)
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
u32 our_hccr, our_hcor; u32 our_hccr, our_hcor;
@ -61,8 +60,8 @@ int ehci_hcd_init(void)
if (tegrausb_start_port(0, &our_hccr, &our_hcor)) if (tegrausb_start_port(0, &our_hccr, &our_hcor))
return -1; return -1;
hccr = (struct ehci_hccr *)our_hccr; *hccr = (struct ehci_hccr *)our_hccr;
hcor = (struct ehci_hcor *)our_hcor; *hcor = (struct ehci_hcor *)our_hcor;
return 0; return 0;
} }
@ -71,7 +70,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
tegrausb_stop_port(); tegrausb_stop_port();
return 0; return 0;

9
drivers/usb/host/ehci-vct.c
Unescape View File

@ -21,7 +21,6 @@
#include <usb.h> #include <usb.h>
#include "ehci.h" #include "ehci.h"
#include "ehci-core.h"
int vct_ehci_hcd_init(u32 *hccr, u32 *hcor); int vct_ehci_hcd_init(u32 *hccr, u32 *hcor);
@ -29,7 +28,7 @@ int vct_ehci_hcd_init(u32 *hccr, u32 *hcor);
* Create the appropriate control structures to manage * Create the appropriate control structures to manage
* a new EHCI host controller. * a new EHCI host controller.
*/ */
int ehci_hcd_init(void) int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
{ {
int ret; int ret;
u32 vct_hccr; u32 vct_hccr;
@ -42,8 +41,8 @@ int ehci_hcd_init(void)
if (ret) if (ret)
return ret; return ret;
hccr = (struct ehci_hccr *)vct_hccr; *hccr = (struct ehci_hccr *)vct_hccr;
hcor = (struct ehci_hcor *)vct_hcor; *hcor = (struct ehci_hcor *)vct_hcor;
return 0; return 0;
} }
@ -52,7 +51,7 @@ int ehci_hcd_init(void)
* Destroy the appropriate control structures corresponding * Destroy the appropriate control structures corresponding
* the the EHCI host controller. * the the EHCI host controller.
*/ */
int ehci_hcd_stop(void) int ehci_hcd_stop(int index)
{ {
return 0; return 0;
} }

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

@ -249,7 +249,7 @@ struct QH {
}; };
/* Low level init functions */ /* Low level init functions */
int ehci_hcd_init(void); int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor);
int ehci_hcd_stop(void); int ehci_hcd_stop(int index);
#endif /* USB_EHCI_H */ #endif /* USB_EHCI_H */

Write Preview
Loading…
Cancel
Save