Patchwork usb: phy: tegra remove include of <mach/iomap.h>

login
register
mail settings
Submitter Stephen Warren
Date Oct. 2, 2012, 10:50 p.m.
Message ID <1349218202-3534-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/188682/
State Superseded, archived
Headers show

Comments

Stephen Warren - Oct. 2, 2012, 10:50 p.m.
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
tegra_usb_phy.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>
Cc: Venu Byravarasu <vbyravarasu@nvidia.com>
---
Felipe, Greg, if this patch can get into 3.7 (it's late, I know) at a point
before wherever you branch off your USB tree for 3.8, then that would be
great. If not, may I please request this patch be merged into a separate
branch/tag that is merged into both the Tegra and USB trees for 3.8, since
I will probably have cleanup patches in the Tegra tree that depend on this
change, and Venu will likely be sending patches through the USB tree that
will need to be merged with this too.
---
 drivers/usb/phy/tegra_usb_phy.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Venu Byravarasu - Oct. 3, 2012, 4:45 a.m.
> -----Original Message-----
> From: Stephen Warren [mailto:swarren@wwwdotorg.org]
> Sent: Wednesday, October 03, 2012 4:20 AM
> To: Felipe Balbi
> Cc: Greg Kroah-Hartman; linux-usb@vger.kernel.org; linux-
> tegra@vger.kernel.org; Stephen Warren; Venu Byravarasu
> Subject: [PATCH] usb: phy: tegra remove include of <mach/iomap.h>
> 
> 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
> tegra_usb_phy.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>
> Cc: Venu Byravarasu <vbyravarasu@nvidia.com>
> ---
> Felipe, Greg, if this patch can get into 3.7 (it's late, I know) at a point
> before wherever you branch off your USB tree for 3.8, then that would be
> great. If not, may I please request this patch be merged into a separate
> branch/tag that is merged into both the Tegra and USB trees for 3.8, since
> I will probably have cleanup patches in the Tegra tree that depend on this
> change, and Venu will likely be sending patches through the USB tree that
> will need to be merged with this too.
> ---
>  drivers/usb/phy/tegra_usb_phy.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/phy/tegra_usb_phy.c
> b/drivers/usb/phy/tegra_usb_phy.c
> index 987116f..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

This change looks fine to me. Plz consider my ACK.
Acked-by: Venu Byravarasu <vbyravarasu@nvidia.com> 

> 
>  #define ULPI_VIEWPORT		0x170
> 
> --
> 1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c
index 987116f..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