Hi, This patch, as well as the MTU2 and CMT counterparts, requires the 'PM / Domains: Introduce "always on" device flag' patch (which failed to apply for you) to work. So, for now please drop all of them (for both v3.3.y and v3.2.y) and I will rebase the whole series and send it to you.
Thanks, Rafael On Thursday, March 22, 2012, [email protected] wrote: > > This is a note to let you know that I've just added the patch titled > > PM / shmobile: Make TMU driver use pm_genpd_dev_always_on() > > to the 3.2-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch > and it can be found in the queue-3.2 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <[email protected]> know about it. > > > From 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa Mon Sep 17 00:00:00 2001 > From: "Rafael J. Wysocki" <[email protected]> > Date: Tue, 13 Mar 2012 22:40:00 +0100 > Subject: PM / shmobile: Make TMU driver use pm_genpd_dev_always_on() > > From: "Rafael J. Wysocki" <[email protected]> > > commit 2ee619f9487c2acc1efdf2c78e68e2bd51b635fa upstream. > > Make the TMU clocksource driver mark its device as "always on" > using pm_genpd_dev_always_on() to protect it from surprise power > removals and make sh7372_add_standard_devices() add TMU devices on > sh7372 to the A4R power domain so that their "always on" flags > are taken into account as appropriate. > > Signed-off-by: Rafael J. Wysocki <[email protected]> > Tested-by: Simon Horman <[email protected]> > Acked-by: Paul Mundt <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > --- > arch/arm/mach-shmobile/setup-sh7372.c | 2 ++ > drivers/clocksource/sh_tmu.c | 4 ++++ > 2 files changed, 6 insertions(+) > > --- a/arch/arm/mach-shmobile/setup-sh7372.c > +++ b/arch/arm/mach-shmobile/setup-sh7372.c > @@ -1028,6 +1028,8 @@ void __init sh7372_add_standard_devices( > sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device); > sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device); > sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device); > + sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device); > + sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device); > } > > void __init sh7372_add_early_devices(void) > --- a/drivers/clocksource/sh_tmu.c > +++ b/drivers/clocksource/sh_tmu.c > @@ -32,6 +32,7 @@ > #include <linux/sh_timer.h> > #include <linux/slab.h> > #include <linux/module.h> > +#include <linux/pm_domain.h> > > struct sh_tmu_priv { > void __iomem *mapbase; > @@ -410,6 +411,9 @@ static int __devinit sh_tmu_probe(struct > struct sh_tmu_priv *p = platform_get_drvdata(pdev); > int ret; > > + if (!is_early_platform_device(pdev)) > + pm_genpd_dev_always_on(&pdev->dev, true); > + > if (p) { > dev_info(&pdev->dev, "kept as earlytimer\n"); > return 0; > > > Patches currently in stable-queue which might be from [email protected] are > > queue-3.2/pm-shmobile-make-mtu2-driver-use-pm_genpd_dev_always_on.patch > queue-3.2/pm-domains-fix-handling-of-wakeup-devices-during-system-resume.patch > queue-3.2/pm-shmobile-make-cmt-driver-use-pm_genpd_dev_always_on.patch > queue-3.2/pm-shmobile-make-tmu-driver-use-pm_genpd_dev_always_on.patch > > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
