Skip to contentSkip to conversation

usb: ehci-omap: Update platform header file path

PATCH In review Olof Johansson 4 participants 9 messages Nov 25, 2009 – Dec 15, 2009 5 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: ehci-omap: Update platform header file path

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

---

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

drivers/usb/host/ehci-omap.c +1 -1
index 7ba8df3..5cfed78 100644
@@ -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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#1 lore raw
Quoted 4 lines · Olaf Johansson

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

Quoted 8 lines

---

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

Quoted 19 lines

Thanks,

(quoted diff) +0 -1
-Olof
drivers/usb/host/ehci-omap.c +1 -1
index 7ba8df3..5cfed78 100644
@@ -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

A message that is not in the archive (sent off-list or not yet received): 5A47E75E594F054BAF48C5E4FC4B92AB030AAC2D5A-/tLxBxkBPtCIQmiDNMet8wC/[email protected]

#3 lore raw
Quoted 9 lines · Anand
Quoted 8 lines · Olaf Johansson

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

---

Quoted 8 lines
Quoted 4 lines

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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
In reply to a message not in the archive
Quoted 7 lines · Anand
Quoted 6 lines · Olof Johansson

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

Quoted 8 lines
Quoted 6 lines

---

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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 15 lines · Olof Johansson
Quoted 14 lines · Anand
Quoted 12 lines · Olof Johansson

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

---

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.

Quoted 8 lines
Quoted 1 line

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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Acked-by on v1 1/1
#7 lore raw
In reply to Olof Johansson
Quoted 9 lines · Olof Johansson

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

---

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 :)

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#9 lore raw
Quoted 7 lines · Greg KH
Quoted 6 lines · Olof Johansson

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

---

Quoted 7 lines
Quoted 3 lines

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 :)

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:

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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#11 lore raw

PATCH 1/1 usb: ehci-omap: Update platform header file path

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.

---

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

Quoted 10 lines · Tony Lindgren

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:

Quoted 8 lines

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

drivers/usb/host/ehci-omap.c +1 -1
index 7ba8df3..5cfed78 100644
@@ -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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#13 lore raw
Quoted 3 lines · 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.

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

Regards,

Tony

Quoted 40 lines

---

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

Quoted 18 lines · Tony Lindgren

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:

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

drivers/usb/host/ehci-omap.c +0 -0
index 7ba8df3..5cfed78 100644

drivers/usb/host/ehci-omap.c line 43

Quoted 8 lines
drivers/usb/host/ehci-omap.c +1 -1
@@ -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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html