summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 00:17:40 -0800
committerOlof Johansson <olof@lixom.net>2012-11-21 00:17:40 -0800
commitbcc5155d05003f1addc91e125082dca886981a31 (patch)
tree253761543a0af664bd69f0edfeb883a76bfd1159 /drivers/usb
parentd4819dc969d0544edd0d0b819a741f10059adcaa (diff)
parentbb1de8877c960b3b3e1c8337730df970b262fd44 (diff)
downloadop-kernel-dev-bcc5155d05003f1addc91e125082dca886981a31.zip
op-kernel-dev-bcc5155d05003f1addc91e125082dca886981a31.tar.gz
Merge tag 'tegra-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From Stephen Warren: ARM: tegra: cleanup for 3.8 Various trivial cleanup changes of the Tegra code for 3.8. Many of the changes simply remove useless #include statements, which enable those headers to be removed or moved later, as work towards multi-platform zImage support. <mach/{iram,io}map.h> are moved up to arch/arm/mach-tegra to prevent any new code outside mach-tegra from using them. Finally, the regulator definitions in all board device tree files are updated to use the new simpler syntax that was agreed upon. * tag 'tegra-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: move irammap.h to mach-tegra ARM: tegra: move iomap.h to mach-tegra ARM: tegra: remove <mach/dma.h> ARM: tegra: move tegra-ahb.h out of arch/arm/mach-tegra/ ARM: tegra: remove unnecessary includes of <mach/*.h> iommu: tegra: remove include of <mach/iomap.h> staging: nvec: remove include of <mach/iomap.h> crypto: tegra: remove include of <mach/clk.h> ARM: tegra: update *.dts for regulator-compatible deprecation usb: phy: tegra remove include of <mach/iomap.h> usb: host: tegra remove include of <mach/iomap.h>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-tegra.c5
-rw-r--r--drivers/usb/phy/tegra_usb_phy.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 6223d175..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
diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c
index 987116f9..9d13c81 100644
--- a/drivers/usb/phy/tegra_usb_phy.c
+++ b/drivers/usb/phy/tegra_usb_phy.c
@@ -29,7 +29,9 @@
#include <linux/usb/ulpi.h>
#include <asm/mach-types.h>
#include <linux/usb/tegra_usb_phy.h>
-#include <mach/iomap.h>
+
+#define TEGRA_USB_BASE 0xC5000000
+#define TEGRA_USB_SIZE SZ_16K
#define ULPI_VIEWPORT 0x170
OpenPOWER on IntegriCloud