summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2014-08-06 09:53:55 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-03-26 00:27:09 +0100
commit2296774af67f2fd728c662d5120e29b849b4d685 (patch)
tree7785f3e9270a60d44e5f747b7eb0e1a2425c7e56 /src/mainboard/google
parent6941b77c879b5411844914dd87796a28b04e3caa (diff)
tegra: Clean up USB code
Pull out the common usb setup utmip functions from t124 into tegra usb.h. These can be reused for t132 as well. BUG=chrome-os-partner:31293 BRANCH=None TEST=Compiles successfully for nyan, big and blaze Change-Id: Idddd40e409b56875436db6918d05f2889d83870b Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 12f12cb30a033cce645f53457d13a987aeec22a1 Original-Change-Id: I83f83bafad0f52ad651fe5989430f41142803f2b Original-Signed-off-by: Furquan Shaikh <furquan@google.com> Original-Reviewed-on: https://chromium-review.googlesource.com/211200 Original-Tested-by: Furquan Shaikh <furquan@chromium.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org> Reviewed-on: http://review.coreboot.org/8927 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/nyan/mainboard.c6
-rw-r--r--src/mainboard/google/nyan_big/mainboard.c6
-rw-r--r--src/mainboard/google/nyan_blaze/mainboard.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 682fdc4db4..b534ea908d 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -29,7 +29,7 @@
#include <soc/nvidia/tegra124/mc.h>
#include <soc/nvidia/tegra124/pmc.h>
#include <soc/nvidia/tegra124/spi.h>
-#include <soc/nvidia/tegra124/usb.h>
+#include <soc/nvidia/tegra/usb.h>
#include <vendorcode/google/chromeos/chromeos.h>
static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
@@ -232,9 +232,9 @@ static void mainboard_init(device_t dev)
CLK_X_AFC2 | CLK_X_AFC3 | CLK_X_AFC4 |
CLK_X_AFC5);
- usb_setup_utmip1();
+ usb_setup_utmip((void*)TEGRA_USBD_BASE);
/* USB2 is the camera, we don't need it in firmware */
- usb_setup_utmip3();
+ usb_setup_utmip((void*)TEGRA_USB3_BASE);
setup_pinmux();
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index ff147e2c15..86d9fe3b37 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -29,7 +29,7 @@
#include <soc/nvidia/tegra124/mc.h>
#include <soc/nvidia/tegra124/pmc.h>
#include <soc/nvidia/tegra124/spi.h>
-#include <soc/nvidia/tegra124/usb.h>
+#include <soc/nvidia/tegra/usb.h>
#include <vendorcode/google/chromeos/chromeos.h>
static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
@@ -230,9 +230,9 @@ static void mainboard_init(device_t dev)
CLK_X_AFC2 | CLK_X_AFC3 | CLK_X_AFC4 |
CLK_X_AFC5);
- usb_setup_utmip1();
+ usb_setup_utmip((void*)TEGRA_USBD_BASE);
/* USB2 is the camera, we don't need it in firmware */
- usb_setup_utmip3();
+ usb_setup_utmip((void*)TEGRA_USB3_BASE);
setup_pinmux();
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 8d4f553cef..ccbaf63f94 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -29,7 +29,7 @@
#include <soc/nvidia/tegra124/mc.h>
#include <soc/nvidia/tegra124/pmc.h>
#include <soc/nvidia/tegra124/spi.h>
-#include <soc/nvidia/tegra124/usb.h>
+#include <soc/nvidia/tegra/usb.h>
#include <vendorcode/google/chromeos/chromeos.h>
static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE;
@@ -230,9 +230,9 @@ static void mainboard_init(device_t dev)
CLK_X_AFC2 | CLK_X_AFC3 | CLK_X_AFC4 |
CLK_X_AFC5);
- usb_setup_utmip1();
- usb_setup_utmip2();
- usb_setup_utmip3();
+ usb_setup_utmip((void*)TEGRA_USBD_BASE);
+ usb_setup_utmip((void*)TEGRA_USB2_BASE);
+ usb_setup_utmip((void*)TEGRA_USB3_BASE);
setup_pinmux();