| Message ID | 1351106941-869-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, 24 Oct 2012, Stephen Warren wrote: > 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> > --- > 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@rowland.harvard.edu> -- 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
On 10/24/2012 01:29 PM, Stephen Warren wrote: > 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. Per suggestion from Greg, I have applied this to the Tegra tree for 3.8. -- 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
Hi, On Mon, Oct 29, 2012 at 11:01:08AM -0600, Stephen Warren wrote: > On 10/24/2012 01:29 PM, Stephen Warren wrote: > > 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. > > Per suggestion from Greg, I have applied this to the Tegra tree for 3.8. so I need not take this patch in my tree, right ? just making sure.
On 10/31/2012 06:51 AM, Felipe Balbi wrote: > Hi, > > On Mon, Oct 29, 2012 at 11:01:08AM -0600, Stephen Warren wrote: >> On 10/24/2012 01:29 PM, Stephen Warren wrote: >>> 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. >> >> Per suggestion from Greg, I have applied this to the Tegra tree >> for 3.8. > > so I need not take this patch in my tree, right ? > > just making sure. I'm fairly sure you'll want to have the patch in your tree too; Greg's suggestion was simply to merge it everywhere it was needed. To summarize: * I've applied the patch to the Tegra tree since it's a dependency for some cleanup. * I think it's needed in whichever USB tree(s) will take the forthcoming Tegra PHY driver rework. Apparently that's your PHY tree. This is however simply to avoid any merge conflicts. If the PHY driver rework ends up not adding any extra includes of <mach/iomap.h> (unlikely if new files are added) then perhaps it isn't needed. Also, if the PHY driver rework ends up not re-arranging the includes a lot, then perhaps it will merge OK without you needing the patch. If you want, perhaps the best course of action is to hold off applying the patch until the PHY driver rework patches appear, and it's obvious whether there will be a hard-to-resolve conflict, and only apply the patch if strictly needed to avoid sticky merge conflicts. * Greg has taken both patches into his USB tree already. Does development process allow you to simply merge that? -- 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
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