| Message ID | 20130130042218.GK28230@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks perfect, thanks! 2013/1/30 Simon Horman <horms@verge.net.au>: > On Sat, Jan 12, 2013 at 04:43:29PM +0100, Bastian Hecht wrote: >> Hi Guennadi, hi Simon, >> >> yes somehow a chunk is missing from my original patch in the patch of >> the next branch that got merged from soc2. I've prepared a revert of >> the bad patch and a corrected version, but now I'm unsure if that >> helps at all. Finally you don't want to get that fixups pulled into >> the mainline. >> >> It seems to me to be a real mess to correct some patch somewhere in >> the middle of merged patch stacks. If I can help Simon, please let me >> know. > > Could you see if the following is correct? > If not could you please prepare whichever of the following makes sense. > > * An incremental patch to add the missing hunk > > * A revert patch and a new patch > > * A revert patch > > http://git.kernel.org/?p=linux/kernel/git/horms/renesas.git;a=commitdiff;h=13baf88bd69ed3cf7e2374eec4a7128f62ae9c1f > > > From 13baf88bd69ed3cf7e2374eec4a7128f62ae9c1f Mon Sep 17 00:00:00 2001 > From: Bastian Hecht <hechtb@gmail.com> > Date: Wed, 5 Dec 2012 12:13:06 +0000 > Subject: [PATCH] ARM: shmobile: sh73a0: Add CPU sleep suspend > > Add the lighest possible sleep mode on Cortex-A9 cores: CPU sleep. It is > entered by a simple dsb and wfi instruction via cpu_do_idle(). As just > clocks are stopped there is no need to save or restore any state of the > system. > > Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> > Acked-by: Magnus Damm <damm@opensource.se> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/Makefile | 1 + > arch/arm/mach-shmobile/board-kzm9g.c | 2 ++ > arch/arm/mach-shmobile/include/mach/common.h | 1 + > arch/arm/mach-shmobile/pm-sh73a0.c | 32 ++++++++++++++++++++++++++ > 4 files changed, 36 insertions(+) > create mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c > > diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile > index 0b71479..f6aba6d 100644 > --- a/arch/arm/mach-shmobile/Makefile > +++ b/arch/arm/mach-shmobile/Makefile > @@ -37,6 +37,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o > obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o > obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o > obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o > +obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o > > # Board objects > obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o > diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c > index ac94285..363c6ed 100644 > --- a/arch/arm/mach-shmobile/board-kzm9g.c > +++ b/arch/arm/mach-shmobile/board-kzm9g.c > @@ -772,6 +772,8 @@ static void __init kzm_init(void) > > sh73a0_add_standard_devices(); > platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); > + > + sh73a0_pm_init(); > } > > static void kzm9g_restart(char mode, const char *cmd) > diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h > index 2d1686b..f221c11 100644 > --- a/arch/arm/mach-shmobile/include/mach/common.h > +++ b/arch/arm/mach-shmobile/include/mach/common.h > @@ -40,6 +40,7 @@ extern void sh73a0_add_early_devices(void); > extern void sh73a0_add_standard_devices(void); > extern void sh73a0_clock_init(void); > extern void sh73a0_pinmux_init(void); > +extern void sh73a0_pm_init(void); > extern struct clk sh73a0_extal1_clk; > extern struct clk sh73a0_extal2_clk; > extern struct clk sh73a0_extcki_clk; > diff --git a/arch/arm/mach-shmobile/pm-sh73a0.c b/arch/arm/mach-shmobile/pm-sh73a0.c > new file mode 100644 > index 0000000..99086e9 > --- /dev/null > +++ b/arch/arm/mach-shmobile/pm-sh73a0.c > @@ -0,0 +1,32 @@ > +/* > + * sh73a0 Power management support > + * > + * Copyright (C) 2012 Bastian Hecht <hechtb+renesas@gmail.com> > + * > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file "COPYING" in the main directory of this archive > + * for more details. > + */ > + > +#include <linux/suspend.h> > +#include <mach/common.h> > + > +#ifdef CONFIG_SUSPEND > +static int sh73a0_enter_suspend(suspend_state_t suspend_state) > +{ > + cpu_do_idle(); > + return 0; > +} > + > +static void sh73a0_suspend_init(void) > +{ > + shmobile_suspend_ops.enter = sh73a0_enter_suspend; > +} > +#else > +static void sh73a0_suspend_init(void) {} > +#endif > + > +void __init sh73a0_pm_init(void) > +{ > + sh73a0_suspend_init(); > +} > -- > 1.7.10.4 >
On Thu, Jan 31, 2013 at 12:31:17PM -0400, Bastian Hecht wrote:
> Looks perfect, thanks!
Great, thanks.
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 0b71479..f6aba6d 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -37,6 +37,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o +obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index ac94285..363c6ed 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -772,6 +772,8 @@ static void __init kzm_init(void) sh73a0_add_standard_devices(); platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); + + sh73a0_pm_init(); } static void kzm9g_restart(char mode, const char *cmd) diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index 2d1686b..f221c11 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -40,6 +40,7 @@ extern void sh73a0_add_early_devices(void); extern void sh73a0_add_standard_devices(void); extern void sh73a0_clock_init(void); extern void sh73a0_pinmux_init(void); +extern void sh73a0_pm_init(void); extern struct clk sh73a0_extal1_clk; extern struct clk sh73a0_extal2_clk; extern struct clk sh73a0_extcki_clk; diff --git a/arch/arm/mach-shmobile/pm-sh73a0.c b/arch/arm/mach-shmobile/pm-sh73a0.c new file mode 100644 index 0000000..99086e9 --- /dev/null +++ b/arch/arm/mach-shmobile/pm-sh73a0.c @@ -0,0 +1,32 @@ +/* + * sh73a0 Power management support + * + * Copyright (C) 2012 Bastian Hecht <hechtb+renesas@gmail.com> + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ + +#include <linux/suspend.h> +#include <mach/common.h> + +#ifdef CONFIG_SUSPEND +static int sh73a0_enter_suspend(suspend_state_t suspend_state) +{ + cpu_do_idle(); + return 0; +} + +static void sh73a0_suspend_init(void) +{ + shmobile_suspend_ops.enter = sh73a0_enter_suspend; +} +#else +static void sh73a0_suspend_init(void) {} +#endif + +void __init sh73a0_pm_init(void) +{ + sh73a0_suspend_init(); +}