* Cousson, Benoit <b-cousson@xxxxxx> [110221 13:35]: > On 2/21/2011 7:22 PM, Tony Lindgren wrote: > >* Cousson, Benoit<b-cousson@xxxxxx> [110218 08:49]: > >>--- > >> From b2190f0d339c9d843eb5e370d0db8b7090fbcfab Mon Sep 17 00:00:00 2001 > >>From: Benoit Cousson<b-cousson@xxxxxx> > >>Date: Fri, 18 Feb 2011 14:01:06 +0100 > >>Subject: [PATCH] OMAP4: hwmod data: Add rev and dev_attr fields in McSPI > >> > >>- Add a rev attribute to identify various McSPI IP version. > >>- Add a dev_attr structure to provide the number of chipselect > >> supported by the instance. > > > >Looks like one seems to be wrapped and does not apply even after unwapping.. > > #$*%&!@ Thunderbird... :) The earlier one had double spaces in the beginning of each line in addition to the line wrapping.. > Here is the same one without the "enable word wrap" and attached as well just in case. > > It should apply on your omap-for-linus branch at commit df7ffd3. Thanks, I'll apply it to omap-for-linus. The omap4 hang seems to be caused by the timer patch, the following fixes it. How do you want to deal with fixing this issue? Tony --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -5094,7 +5094,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { &omap44xx_spinlock_hwmod, /* timer class */ - &omap44xx_timer1_hwmod, +/* &omap44xx_timer1_hwmod, */ &omap44xx_timer2_hwmod, &omap44xx_timer3_hwmod, &omap44xx_timer4_hwmod, -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html