"S, Venkatraman" <[email protected]> writes: >> From: Kevin Hilman <[email protected]> >> Date: Fri, Jul 1, 2011 at 11:24 PM >> Subject: Re: [PATCHv4 0/3] OMAP: HSMMC: cleanup and runtime pm >> To: [email protected] >> Cc: Balaji T K <[email protected]>, [email protected], >> [email protected], [email protected], [email protected], >> [email protected], [email protected], [email protected] >> >> >> Chris, >> >> Balaji T K <[email protected]> writes: >> >>> Removing the custom state machine - lazy disable framework in >>> omap_hsmmc to make way for runtime pm to handle host controller power >>> states. >>> >>> This allows mmc_host_enable/mmc_host_disable to be replaced >>> by runtime get_sync and put_sync at host controller driver. >>> >>> Enable runtime PM in omap_hsmmc >>> >>> Rebased to MMC tree : mmc-next branch >>> Tested on OMAP4430SDP, OMAP3430SDP, OMAP2430SDP >> >> Reviewed-by: Kevin Hilman <[email protected]> >> Tested-by: Kevin Hilman <[email protected]> >> >> Could you queue this series for the v3.1 merge window? Or, with your >> ack, we are happy to take this through the OMAP tree along with the >> other dependecies mentioned below. >> >> I've also tested this on OMAP4430/Blaze, OMAP3630/Zoom3 and >> OMAP3430/n900. >> >> We have OMAP PM core code changes queued for v3.1 which require the MMC >> driver to correctly use runtime PM or we can get hangs if MMC is used >> during boot. >> >> Kevin > > Kevin, > Another series from Per Forlin [1] is also modifying the same file, > and might result in merge conflict if this series is queued under OMAP > and the other is queued by Chris.
OK, then Chris should take this series through his tree. Thanks, Kevin > Chris, > If you intend to queue [1] into mmc-next, Balaji / myself can repost > this series on > top of it or you'd like to practice some git merge ? Let me know if > there is anything that I can do to help. > > [1] https://lkml.org/lkml/2011/7/1/303 > >> >>> MMC runtime patch has dependency on >>> [PATCH 0/6] OMAP2+: hwmod framework fixes [1] >>> for MMC1/MMC2 clock to get ungated after idle in OMAP4. >>> >>> Without [1] patches, MMC1/MMC2 fails to get detected on OMAP4. >>> >>> [1] http://www.mail-archive.com/[email protected]/msg51457.html >>> >>> Balaji T K (3): >>> MMC: OMAP: HSMMC: Remove lazy_disable >>> MMC: OMAP: HSMMC: add runtime pm support >>> MMC: OMAP: HSMMC: Remove unused iclk >>> >>> drivers/mmc/host/omap_hsmmc.c | 365 >>> +++++++---------------------------------- >>> 1 files changed, 57 insertions(+), 308 deletions(-) >> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
