Hi, * Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> [090612 15:13]: > Here's a couple patches to add-back some feature dropped in the > mainline sync. These are needed for the PM branch among other things. > > Applies to linux-omap master. > > Kevin > > Kalle Jokiniemi (1): OMAP3: DMA: Enable idlemodes for DMA OCP This we could justify getting into mainline as a fix, as otherwise some PM features won't work. Will add into omap-fixes. > Kevin Hilman (1): > OMAP2/3: SoC IDs: add omap_type() for determining GP/EMU/HS Is there any reason to get this one into mainline early? If not, I suggest you keep this in your pm branch for next merge window that I can keep merging to l-o master as needed. However, if omap_type() is by other queues earlier, then I can add it into my upstream queue. If this blocks several queues from being rebased against mainline kernel, that alone might already be a good enough reason to get it in early. Regards, Tony > arch/arm/mach-omap2/id.c | 22 ++++++++++++++++++++++ > arch/arm/plat-omap/dma.c | 13 +++++++++++++ > arch/arm/plat-omap/include/mach/dma.h | 15 +++++++++++++++ > 3 files changed, 50 insertions(+), 0 deletions(-) > > -- > 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 -- 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
