diff mbox

[REPOST] usb: host: tegra remove include of <mach/iomap.h>

Message ID 1350324934-30797-1-git-send-email-swarren@wwwdotorg.org
State Superseded, archived
Headers show

Commit Message

Stephen Warren Oct. 15, 2012, 6:15 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

Almost nothing from this file is used, and the file will hopefully be
deleted soon. Copy the tiny portions that are used directly into
ehci-tegra.c. I believe that Venu Byravarasu is working on cleaning up
our USB driver, and those cleanups will remove the need for these
constants.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
Greg, Alan,

This patch is needed in the Tegra branch, since it's a dependency for
cleanup required to support single zImage.

However, I suspect/hope there will be significant improvements to the Tegra
USB driver in 3.8, and this change may merge-conflict with those. It may be
simplest if this patch can /also/ be taken through the USB tree and so act
as a baseline for any Tegra USB work.

As such, may I please request this patch be merged into a separate branch/tag
in the USB tree, which is then merged into both the Tegra and USB trees.

Thanks.
---
 drivers/usb/host/ehci-tegra.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 6223d17..2de0890 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -28,7 +28,10 @@ 
 #include <linux/pm_runtime.h>
 
 #include <linux/usb/tegra_usb_phy.h>
-#include <mach/iomap.h>
+
+#define TEGRA_USB_BASE			0xC5000000
+#define TEGRA_USB2_BASE			0xC5004000
+#define TEGRA_USB3_BASE			0xC5008000
 
 #define TEGRA_USB_DMA_ALIGN 32