On Wed, 24 Oct 2012, Stephen Warren wrote: > From: Stephen Warren <swarren@xxxxxxxxxx> > > 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@xxxxxxxxxx> > Acked-by: Venu Byravarasu <vbyravarasu@xxxxxxxxxx> > --- > Felipe, > > 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 PHY tree and so act > as a baseline for any Tegra PHY work. > > As such, may I please request this patch be merged into a separate branch/tag > in the PHY tree, which is then merged into both the Tegra and PHY trees. > > Note that this affects an EHCI driver rather than a PHY driver, but per > previous discussions, it sounds like the PHY branch will take any EHCI > changes required by Tegra's PHY driver cleanup, and hence the PHY branch > is the right place to merge this. > > Thanks. > --- > drivers/usb/host/ehci-tegra.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > 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 You did make sure it still compiles, right? :-) Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html