[PATCH] usb: ehci-omap: Update platform header file path

[PATCH] usb: ehci-omap: Update platform header file path

[Olof Johansson]

The OMAP usb header file has moved, update the driver so it will build.

Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>

---

Greg, any chance you can just ack this so Tony can merge it through his
tree for .33? The header files changes in question are going in through
that tree.


Thanks,

-Olof

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 7ba8df3..5cfed78 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -37,7 +37,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
-#include <mach/usb.h>
+#include <plat/usb.h>
 
 /*
  * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] usb: ehci-omap: Update platform header file path

[Gadiyar, Anand]

Olaf Johansson wrote:
> 
> The OMAP usb header file has moved, update the driver so it 
> will build.
> 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> ---
> 
> Greg, any chance you can just ack this so Tony can merge it through his
> tree for .33? The header files changes in question are going in through
> that tree.
> 

I believe it has already been taken care of in Tony's for-next?

- Anand

> 
> Thanks,
> 
> -Olof
> 
> diff --git a/drivers/usb/host/ehci-omap.c 
> b/drivers/usb/host/ehci-omap.c
> index 7ba8df3..5cfed78 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -37,7 +37,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/clk.h>
>  #include <linux/gpio.h>
> -#include <mach/usb.h>
> +#include <plat/usb.h>
>  
>  /*
>   * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Olof Johansson]

On Wed, Nov 25, 2009 at 02:35:56PM +0530, Gadiyar, Anand wrote:
> Olaf Johansson wrote:
> > 
> > The OMAP usb header file has moved, update the driver so it 
> > will build.
> > 
> > Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> > 
> > ---
> > 
> > Greg, any chance you can just ack this so Tony can merge it through his
> > tree for .33? The header files changes in question are going in through
> > that tree.
> > 
> 
> I believe it has already been taken care of in Tony's for-next?
> 
> - Anand

Tony's master branch does not build due to this for me. Maybe it doesn't
include for-next?!


-Olof

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

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Olof Johansson]

On Wed, Nov 25, 2009 at 02:35:56PM +0530, Gadiyar, Anand wrote:
> Olof Johansson wrote:
> > 
> > The OMAP usb header file has moved, update the driver so it 
> > will build.
> > 
> > Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> > 
> > ---
> > 
> > Greg, any chance you can just ack this so Tony can merge it through his
> > tree for .33? The header files changes in question are going in through
> > that tree.
> > 
> 
> I believe it has already been taken care of in Tony's for-next?

Oh, weird. Looking at the history of the file on git.kernel.org:

http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=history;f=drivers/usb/host/ehci-omap.c;hb=HEAD

It shows Tony making the change on Oct 30, and then 4 fresh merges of
the driver? That's odd.


-Olof

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

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Tony Lindgren]

* Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> [091125 01:13]:
> On Wed, Nov 25, 2009 at 02:35:56PM +0530, Gadiyar, Anand wrote:
> > Olof Johansson wrote:
> > > 
> > > The OMAP usb header file has moved, update the driver so it 
> > > will build.
> > > 
> > > Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> > > 
> > > ---
> > > 
> > > Greg, any chance you can just ack this so Tony can merge it through his
> > > tree for .33? The header files changes in question are going in through
> > > that tree.
> > > 
> > 
> > I believe it has already been taken care of in Tony's for-next?
> 
> Oh, weird. Looking at the history of the file on git.kernel.org:
> 
> http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=history;f=drivers/usb/host/ehci-omap.c;hb=HEAD
> 
> It shows Tony making the change on Oct 30, and then 4 fresh merges of
> the driver? That's odd.

Yeah those duplicate commits happen when we rebuild the linux-omap
tree on a new -rc. That's when all the development and testing
branches get merged back in again.

To keep the linux-omap tree pullable all the time, we rebuild 
the linux-omap tree periodically with something like this:

$ git checkout -b tmp-rebuild-1258915893 linus
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1258915893

What I've queued up is in for-next branch, omap-testing and
cbus are just development branches that may get rebased as
needed. And master branch is what people are using for omap
to test things, and that stays pullable.

As we currently carry the ehci-omap patch in omap-testing branch,
it shows up as a merge every time we rebuild. These duplicate
commits will disappear once the echi-omap gets merged to Linus'
tree.

Regards,

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

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Greg KH]

On Wed, Nov 25, 2009 at 03:02:59AM -0600, Olof Johansson wrote:
> The OMAP usb header file has moved, update the driver so it will build.
> 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> ---
> 
> Greg, any chance you can just ack this so Tony can merge it through his
> tree for .33? The header files changes in question are going in through
> that tree.

Sure, but for such a trivial change, I doubt you need my ack :)

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Tony Lindgren]

* Greg KH <gregkh-l3A5Bk7waGM@public.gmane.org> [091125 05:06]:
> On Wed, Nov 25, 2009 at 03:02:59AM -0600, Olof Johansson wrote:
> > The OMAP usb header file has moved, update the driver so it will build.
> > 
> > Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> > 
> > ---
> > 
> > Greg, any chance you can just ack this so Tony can merge it through his
> > tree for .33? The header files changes in question are going in through
> > that tree.
> 
> Sure, but for such a trivial change, I doubt you need my ack :)
> 
> Acked-by: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>

The ehci-omap.c driver should be in Greg's queue. I only have the
the related platform init code and header changes in my for-next
because of the omap header move from mach to plat.

IMHO, this fix would be best added to Greg's queue as the ehci-omap.c
driver is there [1]. Or just merged into the exisiting patch
to keep git bisect working:

Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>

Meanwhile, I'll also add this fix to omap-testing and master branches
so people can use it until it gets merged.

Regards,

Tony

[1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] usb: ehci-omap: Update platform header file path

[Olof Johansson]

The OMAP usb header file will move in the same merge window as this
driver is getting introduced in, so update the driver now instead of
making a merge-order-dependent patch later on through linux-omap.

Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>


---

Greg, see below for history (you were Cc:d at the time). Should have
gone to you in the first place. Sorry for the confusion. Either combine
with the ehci-omap patch, or merge separate.   Thanks!

-Olof


On Wed, Nov 25, 2009 at 09:57:39AM -0800, Tony Lindgren wrote:

> The ehci-omap.c driver should be in Greg's queue. I only have the
> the related platform init code and header changes in my for-next
> because of the omap header move from mach to plat.
> 
> IMHO, this fix would be best added to Greg's queue as the ehci-omap.c
> driver is there [1]. Or just merged into the exisiting patch
> to keep git bisect working:
> 
> Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> 
> Meanwhile, I'll also add this fix to omap-testing and master branches
> so people can use it until it gets merged.
> 
> Regards,
> 
> Tony
> 
> [1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch


diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 7ba8df3..5cfed78 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -37,7 +37,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
-#include <mach/usb.h>
+#include <plat/usb.h>
 
 /*
  * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] usb: ehci-omap: Update platform header file path

[Tony Lindgren]

* Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> [091203 18:20]:
> The OMAP usb header file will move in the same merge window as this
> driver is getting introduced in, so update the driver now instead of
> making a merge-order-dependent patch later on through linux-omap.

I'll get this merged via omap-fixes queue as it seems like it's not
in Greg's queue.

Regards,

Tony

 
> Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> 
> 
> ---
> 
> Greg, see below for history (you were Cc:d at the time). Should have
> gone to you in the first place. Sorry for the confusion. Either combine
> with the ehci-omap patch, or merge separate.   Thanks!
> 
> -Olof
> 
> 
> On Wed, Nov 25, 2009 at 09:57:39AM -0800, Tony Lindgren wrote:
> 
> > The ehci-omap.c driver should be in Greg's queue. I only have the
> > the related platform init code and header changes in my for-next
> > because of the omap header move from mach to plat.
> > 
> > IMHO, this fix would be best added to Greg's queue as the ehci-omap.c
> > driver is there [1]. Or just merged into the exisiting patch
> > to keep git bisect working:
> > 
> > Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> > 
> > Meanwhile, I'll also add this fix to omap-testing and master branches
> > so people can use it until it gets merged.
> > 
> > Regards,
> > 
> > Tony
> > 
> > [1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
> 
> 
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 7ba8df3..5cfed78 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -37,7 +37,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/clk.h>
>  #include <linux/gpio.h>
> -#include <mach/usb.h>
> +#include <plat/usb.h>
>  
>  /*
>   * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html