Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355500
b: refs/heads/master
c: 13baf88
h: refs/heads/master
v: v3
  • Loading branch information
Bastian Hecht authored and Simon Horman committed Jan 25, 2013
1 parent 4049617 commit 2ee1b0a
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a21cdaee85e28489a6fe606b8eb0fef32ebf635
refs/heads/master: 13baf88bd69ed3cf7e2374eec4a7128f62ae9c1f
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-shmobile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-shmobile/board-kzm9g.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-shmobile/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
32 changes: 32 additions & 0 deletions trunk/arch/arm/mach-shmobile/pm-sh73a0.c
Original file line number Diff line number Diff line change
@@ -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();
}

0 comments on commit 2ee1b0a

Please sign in to comment.