Commit fdb4b9a7 authored by Lucas Stach's avatar Lucas Stach Committed by Tom Warren

tegra: usb: move controller init into start_port

There is no need to init a USB controller before the upper layers indicate
that they are actually going to use it.

board_usb_init now only parses the device tree and sets up the common pll.
Signed-off-by: default avatarLucas Stach <dev@lynxeye.de>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
Signed-off-by: default avatarTom Warren <twarren@nvidia.com>
parent a4bdcc38
...@@ -79,6 +79,7 @@ struct fdt_usb { ...@@ -79,6 +79,7 @@ struct fdt_usb {
unsigned ulpi:1; /* 1 if port has external ULPI transceiver */ unsigned ulpi:1; /* 1 if port has external ULPI transceiver */
unsigned enabled:1; /* 1 to enable, 0 to disable */ unsigned enabled:1; /* 1 to enable, 0 to disable */
unsigned has_legacy_mode:1; /* 1 if this port has legacy mode */ unsigned has_legacy_mode:1; /* 1 if this port has legacy mode */
unsigned initialized:1; /* has this port already been initialized? */
enum dr_mode dr_mode; /* dual role mode */ enum dr_mode dr_mode; /* dual role mode */
enum periph_id periph_id;/* peripheral id */ enum periph_id periph_id;/* peripheral id */
struct fdt_gpio_state vbus_gpio; /* GPIO for vbus enable */ struct fdt_gpio_state vbus_gpio; /* GPIO for vbus enable */
...@@ -426,44 +427,36 @@ static void config_clock(const u32 timing[]) ...@@ -426,44 +427,36 @@ static void config_clock(const u32 timing[])
timing[PARAM_CPCON], timing[PARAM_LFCON]); timing[PARAM_CPCON], timing[PARAM_LFCON]);
} }
/** int tegrausb_start_port(int portnum, u32 *hccr, u32 *hcor)
* Add a new USB port to the list of available ports.
*
* @param config USB port configuration
* @return 0 if ok, -1 if error (too many ports)
*/
static int add_port(struct fdt_usb *config)
{ {
if (port_count == USB_PORTS_MAX) { struct fdt_usb *config;
printf("tegrausb: Cannot register more than %d ports\n", struct usb_ctlr *usbctlr;
USB_PORTS_MAX);
if (portnum >= port_count)
return -1; return -1;
}
config = &port[portnum];
/* skip init, if the port is already initialized */
if (config->initialized)
goto success;
if (config->utmi && init_utmi_usb_controller(config)) { if (config->utmi && init_utmi_usb_controller(config)) {
printf("tegrausb: Cannot init port\n"); printf("tegrausb: Cannot init port %d\n", portnum);
return -1; return -1;
} }
if (config->ulpi && init_ulpi_usb_controller(config)) { if (config->ulpi && init_ulpi_usb_controller(config)) {
printf("tegrausb: Cannot init port\n"); printf("tegrausb: Cannot init port %d\n", portnum);
return -1; return -1;
} }
port[port_count++] = *config; set_host_mode(config);
return 0;
}
int tegrausb_start_port(int portnum, u32 *hccr, u32 *hcor)
{
struct usb_ctlr *usbctlr;
if (portnum >= port_count) config->initialized = 1;
return -1;
set_host_mode(&port[portnum]);
usbctlr = port[portnum].reg; success:
usbctlr = config->reg;
*hccr = (u32)&usbctlr->cap_length; *hccr = (u32)&usbctlr->cap_length;
*hcor = (u32)&usbctlr->usb_cmd; *hcor = (u32)&usbctlr->usb_cmd;
return 0; return 0;
...@@ -483,6 +476,8 @@ int tegrausb_stop_port(int portnum) ...@@ -483,6 +476,8 @@ int tegrausb_stop_port(int portnum)
writel(2, &usbctlr->usb_cmd); writel(2, &usbctlr->usb_cmd);
udelay(1000); udelay(1000);
port[portnum].initialized = 0;
return 0; return 0;
} }
...@@ -546,6 +541,12 @@ int board_usb_init(const void *blob) ...@@ -546,6 +541,12 @@ int board_usb_init(const void *blob)
count = fdtdec_find_aliases_for_id(blob, "usb", count = fdtdec_find_aliases_for_id(blob, "usb",
COMPAT_NVIDIA_TEGRA20_USB, node_list, USB_PORTS_MAX); COMPAT_NVIDIA_TEGRA20_USB, node_list, USB_PORTS_MAX);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (port_count == USB_PORTS_MAX) {
printf("tegrausb: Cannot register more than %d ports\n",
USB_PORTS_MAX);
return -1;
}
debug("USB %d: ", i); debug("USB %d: ", i);
node = node_list[i]; node = node_list[i];
if (!node) if (!node)
...@@ -555,10 +556,10 @@ int board_usb_init(const void *blob) ...@@ -555,10 +556,10 @@ int board_usb_init(const void *blob)
fdt_get_name(blob, node, NULL)); fdt_get_name(blob, node, NULL));
return -1; return -1;
} }
config.initialized = 0;
if (add_port(&config)) /* add new USB port to the list of available ports */
return -1; port[port_count++] = config;
set_host_mode(&config);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment