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>

1 files changed, 2 insertions, 91 deletions

diff --git a/src/soc/nvidia/tegra/usb.h b/src/soc/nvidia/tegra/usb.h
index f720c2aab3..9d22b0b867 100644
--- a/src/soc/nvidia/tegra/usb.h
+++ b/src/soc/nvidia/tegra/usb.h
@@ -22,95 +22,6 @@
 
 #include <stdint.h>
 
-struct utmip_ctlr {
-	u32 pll0;
-	u32 pll1;
-	u32 xcvr0;
-	u32 bias0;
-	u32 hsrx0;
-	u32 hsrx1;
-	u32 fslsrx0;
-	u32 fslsrx1;
-	u32 tx;
-	u32 misc0;
-	u32 misc1;
-	u32 debounce;
-	u32 batchrgr;
-	u32 spare;
-	u32 xcvr1;
-	u32 bias1;
-	u32 bias_sts;
-	u32 chrgr_debounce;
-	u32 misc_sts;
-	u32 pmc_wakeup;
-};
-check_member(utmip_ctlr, pmc_wakeup, 0x84c - 0x800);
-
-struct usb_ctlr {
-	u32 id;
-	u32 _rsv0;
-	u32 host;
-	u32 device;
-	u32 txbuf;			/* 0x010 */
-	u32 rxbuf;
-	u32 _rsv1[58];
-	u16 ehci_caplen;		/* 0x100 */
-	u16 ehci_version;
-	u32 ehci_hcsp;
-	u32 ehci_hccp;
-	u32 _rsv2[5];
-	u32 dci_version;		/* 0x120 */
-	u32 dcc_params;
-	u32 extsts;
-	u32 extintr;
-	u32 ehci_usbcmd;		/* 0x130 */
-	u32 ehci_usbsts;
-	u32 ehci_usbintr;
-	u32 ehci_frindex;
-	u32 _rsv3;			/* 0x140 */
-	u32 ehci_periodic_base;
-	u32 ehci_async_base;
-	u32 async_ttsts;
-	u32 burst_size;			/* 0x150 */
-	u32 tx_fill_tuning;
-	u32 _rsv4;
-	u32 icusb_ctrl;
-	u32 ulpi_viewport;		/* 0x160 */
-	u32 _rsv5[4];
-	u32 ehci_portsc;
-	u32 _rsv6[15];
-	u32 lpm_ctrl;
-	u32 _rsv7[15];
-	u32 otgsc;
-	u32 usb_mode;
-	u32 _rsv8;
-	u32 ep_nak;			/* 0x200 */
-	u32 ep_nak_enable;
-	u32 ep_setup;
-	u32 ep_init;
-	u32 ep_deinit;
-	u32 ep_sts;
-	u32 ep_complete;
-	u32 ep_ctrl[16];
-	u32 _rsv9[105];
-	u32 suspend_ctrl;		/* 0x400 */
-	u32 vbus_sensors;
-	u32 vbus_wakeup_id;
-	u32 alt_vbus_sts;
-	u32 legacy_ctrl;
-	u32 _rsv10[3];
-	u32 interpacket_delay;
-	u32 _rsv11[27];
-	u32 resume_delay;
-	u32 _rsv12;
-	u32 spare;
-	u32 _rsv13[9];
-	u32 new_ctrl;
-	u32 _rsv14[207];
-	struct utmip_ctlr utmip;	/* 0x800 */
-};
-check_member(usb_ctlr, utmip, 0x800);
-
 enum usb_phy_type {		/* For use in lpm_ctrl[31:29] */
 	USB_PHY_UTMIP = 0,
 	USB_PHY_ULPI = 2,
@@ -118,6 +29,6 @@ enum usb_phy_type {		/* For use in lpm_ctrl[31:29] */
 	USB_PHY_HSIC = 4,
 };
 
-void usb_setup_utmip(struct usb_ctlr *usb);
-void usb_ehci_reset_and_prepare(struct usb_ctlr *usb, enum usb_phy_type type);
+void usb_setup_utmip(void *usb_base);
+
 #endif