Skip to contentSkip to conversation

Git tree updated to v2.6.29-rc1, omap-2.6.28 branch added

DISCUSSION Tony Lindgren 2 participants 8 messages Jan 15, 2009 – Jan 18, 2009 USB

lore
Share & tools
lore
#0 lore raw

Hi all,

I've updated our git tree to v2.6.29-rc1, and will start cleaning up code in it by resetting what can be reset to be the same as in the mainline tree.

This means that everybody please resend the stuff you want back as patches against the mainline tree! Most likely the stuff I'm removing will require a bit of clean-up work. But cleaning it all up is just way too much work for one person to do, so we take the distributed approach :)

I've also added a new branch omap-2.6.28 where we can add few bug fixes until we can tag v2.6.28-omap2.

Regards,

Tony

#1 lore raw
Quoted 1 line · Tony Lindgren

I've updated our git tree to v2.6.29-rc1,

CC arch/arm/mach-omap2/usb-musb.o
arch/arm/mach-omap2/usb-musb.c:47: error: 'INT_243X_HS_USB_MC' undeclared here (not in a function) arch/arm/mach-omap2/usb-musb.c:51: error: 'INT_243X_HS_USB_DMA' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/usb-musb.o] Error 1

... just FYI. I won't have time to sort that out for a few hours yet, so if someone else has a patch that'd be good.

#2 lore raw
In reply to Tony Lindgren
Quoted 1 line · Tony Lindgren

I've updated our git tree to v2.6.29-rc1,

OK, after adding the IRQ patch from Anand, and the appended USB patch (from before the 2.6.29 merge window), it builds.

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. I'm not thinking (a) relates to the "can't get debounce clock" message, I saw that on earlier code that still booted just fine.

That's on a trusty Beagle config. I don't think I'll be upgrading anything else just yet...

- Dave

============= CUT HERE
Subject: drivers/usb/core/hub.c: fix CONFIG_USB_OTG=y build
From: David Brownell <[email protected]>

Carry out the PM-routine interface change in the USB OTG pathway. This was omitted from the earlier interface-change patch by mistake.

Cc Greg KH <[email protected]>
Cc Russell King <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>

---

 drivers/usb/core/hub.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hub.c renamed from drivers/usb/core/hub.c~drivers-usb-core-hubc-fix-config_usb_otg=y-build +1 -1
diff -puN drivers/usb/core/hub.c~drivers-usb-core-hubc-fix-config_usb_otg=y-build drivers/usb/core/hub.c
@@ -1554,7 +1554,7 @@ static int usb_configure_device_otg(stru
 		 * (Includes HNP test device.)
 		 */
 		if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
-			err = usb_port_suspend(udev);
+			err = usb_port_suspend(udev, PMSG_SUSPEND);
 			if (err < 0)
 				dev_dbg(&udev->dev, "HNP fail, %d\n", err);
 		}
author Applied
#3 lore raw
Quoted 6 lines · David Brownell
Quoted 1 line · Tony Lindgren

I've updated our git tree to v2.6.29-rc1,

OK, after adding the IRQ patch from Anand, and the appended USB patch (from before the 2.6.29 merge window), it builds.

Quoted 6 lines

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. I'm not thinking (a) relates to the "can't get debounce clock" message, I saw that on earlier code that still booted just fine.

Thanks, applied and pushed to l-o tree.

Quoted 2 lines

That's on a trusty Beagle config. I don't think I'll be upgrading anything else just yet...

Hmm, that sounds conservative! :)

Tony

Quoted 38 lines

- Dave

============= CUT HERE
Subject: drivers/usb/core/hub.c: fix CONFIG_USB_OTG=y build
From: David Brownell <[email protected]>

Carry out the PM-routine interface change in the USB OTG pathway. This was omitted from the earlier interface-change patch by mistake.

Cc Greg KH <[email protected]>
Cc Russell King <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>

---

 drivers/usb/core/hub.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/usb/core/hub.c~drivers-usb-core-hubc-fix-config_usb_otg=y-build drivers/usb/core/hub.c

drivers/usb/core/hub.c renamed from drivers/usb/core/hub.c~drivers-usb-core-hubc-fix-config_usb_otg=y-build +1 -2
@@ -1554,7 +1554,7 @@ static int usb_configure_device_otg(stru
 		 * (Includes HNP test device.)
 		 */
 		if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
-			err = usb_port_suspend(udev);
+			err = usb_port_suspend(udev, PMSG_SUSPEND);
 			if (err < 0)
 				dev_dbg(&udev->dev, "HNP fail, %d\n", err);
 		}
--

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

#4 lore raw
Quoted 10 lines · Tony Lindgren
Quoted 8 lines

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. ....

That's on a trusty Beagle config.  I don't think I'll be upgrading anything else just yet...

Hmm, that sounds conservative! :)

You're just trying to get me to find out what's broken and fix it! I'm on to that particular dastardly plot... ;)

It'd be somewhat usable if the MMC were live.

- dave

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

#5 lore raw
Quoted 7 lines · David Brownell
Quoted 6 lines · Tony Lindgren
Quoted 5 lines

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. ....

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

That's on a trusty Beagle config.  I don't think I'll be upgrading anything else just yet...

Hmm, that sounds conservative! :)

You're just trying to get me to find out what's broken and fix it! I'm on to that particular dastardly plot... ;)

Oh no, busted!

Quoted 1 line

It'd be somewhat usable if the MMC were live.

Seems to work on at least overo, no ideas what might have happened to it on beagle.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#6 lore raw
Quoted 16 lines · Tony Lindgren
Quoted 7 lines · David Brownell
Quoted 6 lines · Tony Lindgren
Quoted 5 lines

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. ....

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

That's on a trusty Beagle config.  I don't think I'll be upgrading anything else just yet...

Hmm, that sounds conservative! :)

You're just trying to get me to find out what's broken and fix it! I'm on to that particular dastardly plot... ;)

Quoted 6 lines

Oh no, busted!

Quoted 1 line

It'd be somewhat usable if the MMC were live.

Seems to work on at least overo, no ideas what might have happened to it on beagle.

MMC seems to work also on omap3430sdp.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#7 lore raw
Quoted 4 lines

Then when it tries to boot, (a) the HSMMC driver reports "error -110" then chokes, so no root FS; and then (b) MUSB misdetects the high speed hub as full speed then chokes, so no network links either. ....

Found it. A Kconfig option I thought was "off" got turned "on".

Even though the VMMC1, VDAC, VUSB1V5, VUSB1V8, and VUSB3V1 rails aren't yet enabled by the drivers using them ... they sort of need to be left on (except for VDAC). ;)

- Dave