"Nayak, Rajendra" <rna...@ti.com> writes: >> -----Original Message----- >> From: linux-omap-ow...@vger.kernel.org >> [mailto:linux-omap-ow...@vger.kernel.org] On Behalf Of Kevin Hilman >> Sent: Thursday, August 05, 2010 4:21 AM >> To: linux-omap@vger.kernel.org >> Subject: PM branch updated to v2.6.35, SRF dropped >> >> Hello, >> > > Hi Kevin, > > Can you pull in this patch into your branch as well? > http://marc.info/?l=linux-usb&m=127858711304301&w=2 > Without this multi-omap build seems to be broken.
Done. > Also with omap_4430sdp_defconfig, I see these compile errors > arch/arm/kernel/entry-armv.S: Assembler messages: > arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi > r0,r6,r5,lr' > arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi > r0,r6,r5,lr' > make[1]: *** [arch/arm/kernel/entry-armv.o] Error 1 > make: *** [arch/arm/kernel] Error 2 > > Doing a git log on entry-armv.S shows me a top commit which might > be an issue if conflicts are'nt resolved well. > > commit 7b70c4275f28702b76b273c8534c38f8313812e9 > Merge: ceb0885... a20df56... > Author: Russell King <rmk+ker...@arm.linux.org.uk> > Date: Sat Jul 31 14:20:16 2010 +0100 > > Merge branch 'devel-stable' into devel > > Conflicts: > arch/arm/kernel/entry-armv.S > arch/arm/kernel/setup.c > arch/arm/mm/init.c > > Maybe this is an issue in Tony's for-next as well. Haven't tested > it though. Yeah, I'm guessing this an issue in for-next, and probably l-o master too. Kevin > >> It's been a while since a PM branch update, thanks to a nice summer >> vacation for me. :) >> >> The PM branch has now been updated to v2.6.35 plus Tony's for-next >> branch. >> >> This is mostly a rebase, but the most important change is that I'm >> finally dropping SRF as promised[1]. The new DVFS >> infrastructure is now >> in the RFC/PATCH phase so I'm no longer going to keep dragging SRF >> along. Note that this means that ***DVFS no longer works in >> the PM branch***. >> If this bothers you, then please consider helping review and test the >> new DVFS infrastructure recently posted by Thara so we can >> get the new, >> upstream-ready DVFS code upstream ASAP. >> >> I've only tested the new PM branch on a couple boards to avoid any >> further delay getting this version out, update, so hopefully >> others will >> help test. >> >> I've tested RET on idle & suspend, OFF in idle & suspend on: >> >> 3430/omap3evm: works >> >> 3630/Zoom3: works >> - Known problem: console hangs on UART wakeup when wakeups >> are enabled using >> echo enabled > >> /sys/devices/platform/serial8250.0/tty/ttyS0/power/wakeup >> but I haven't debugged this further. >> >> Kevin >> >> >> [1] http://marc.info/?l=linux-omap&m=127206504624556&w=2 >> -- >> To unsubscribe from this list: send the line "unsubscribe >> linux-omap" in >> the body of a message to majord...@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
