Veyron: Fix usb bus names
This should now match what the kernel uses in terms of naming.
BUG=None
TEST=Everything still compiles/runs the same, no functional change
BRANCH=None
Change-Id: Ib207006505ed2f9c6d879d6744a18b513587ceda
Signed-off-by: Alexandru M Stan <amstan@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/245490
Reviewed-by: Neil Hendin <nhendin@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/src/board/veyron_brain/board.c b/src/board/veyron_brain/board.c
index 054f333..52de374 100644
--- a/src/board/veyron_brain/board.c
+++ b/src/board/veyron_brain/board.c
@@ -75,12 +75,12 @@
list_insert_after(&emmc->mmc.ctrlr.list_node,
&fixed_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
/* Lid always open for now. */
flag_replace(FLAG_LIDSW, new_gpio_high());
diff --git a/src/board/veyron_danger/board.c b/src/board/veyron_danger/board.c
index fdd1368..ee2cd41 100644
--- a/src/board/veyron_danger/board.c
+++ b/src/board/veyron_danger/board.c
@@ -83,14 +83,14 @@
list_insert_after(&sd_card->mmc.ctrlr.list_node,
&removable_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
+ UsbHostController *usb_host0_ehci = new_usb_hc(EHCI, 0xff500000);
+ list_insert_after(&usb_host0_ehci->list_node, &usb_host_controllers);
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
- UsbHostController *usb_host2 = new_usb_hc(EHCI, 0xff500000);
- list_insert_after(&usb_host2->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
/* Lid always open for now. */
flag_replace(FLAG_LIDSW, new_gpio_high());
diff --git a/src/board/veyron_jerry/board.c b/src/board/veyron_jerry/board.c
index f632649..b7feacf 100644
--- a/src/board/veyron_jerry/board.c
+++ b/src/board/veyron_jerry/board.c
@@ -87,12 +87,12 @@
list_insert_after(&sd_card->mmc.ctrlr.list_node,
&removable_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
ramoops_buffer(0x31f00000, 0x100000, 0x20000);
if (lib_sysinfo.framebuffer != NULL) {
diff --git a/src/board/veyron_mighty/board.c b/src/board/veyron_mighty/board.c
index 403ccbe..bcbab4d 100644
--- a/src/board/veyron_mighty/board.c
+++ b/src/board/veyron_mighty/board.c
@@ -87,12 +87,12 @@
list_insert_after(&sd_card->mmc.ctrlr.list_node,
&removable_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
ramoops_buffer(0x31f00000, 0x100000, 0x20000);
if (lib_sysinfo.framebuffer != NULL) {
diff --git a/src/board/veyron_pinky/board.c b/src/board/veyron_pinky/board.c
index f3819eb..eb9f872 100644
--- a/src/board/veyron_pinky/board.c
+++ b/src/board/veyron_pinky/board.c
@@ -88,12 +88,12 @@
list_insert_after(&sd_card->mmc.ctrlr.list_node,
&removable_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
ramoops_buffer(0x31f00000, 0x100000, 0x20000);
if (lib_sysinfo.framebuffer != NULL) {
diff --git a/src/board/veyron_rialto/board.c b/src/board/veyron_rialto/board.c
index 3563f5b..9264045 100644
--- a/src/board/veyron_rialto/board.c
+++ b/src/board/veyron_rialto/board.c
@@ -75,12 +75,12 @@
list_insert_after(&emmc->mmc.ctrlr.list_node,
&fixed_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
/* Lid always open for now. */
flag_replace(FLAG_LIDSW, new_gpio_high());
diff --git a/src/board/veyron_speedy/board.c b/src/board/veyron_speedy/board.c
index 2a43532..a52b822 100644
--- a/src/board/veyron_speedy/board.c
+++ b/src/board/veyron_speedy/board.c
@@ -87,12 +87,12 @@
list_insert_after(&sd_card->mmc.ctrlr.list_node,
&removable_block_dev_controllers);
- UsbHostController *usb_host0 = new_usb_hc(DWC2, 0xff580000);
- list_insert_after(&usb_host0->list_node, &usb_host_controllers);
-
UsbHostController *usb_host1 = new_usb_hc(DWC2, 0xff540000);
list_insert_after(&usb_host1->list_node, &usb_host_controllers);
+ UsbHostController *usb_otg = new_usb_hc(DWC2, 0xff580000);
+ list_insert_after(&usb_otg->list_node, &usb_host_controllers);
+
ramoops_buffer(0x31f00000, 0x100000, 0x20000);
if (lib_sysinfo.framebuffer != NULL) {
