Skip to contentSkip to conversation

ARM: S5PV210: Add Power Management Support

PATCH Superseded Sangbeom Kim 3 participants 5 messages Sep 15, 2010 – Sep 17, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ARM: S5PV210: Add Power Management Support

From: Jongpill Lee <[email protected]>

This patch adds suspend-to-ram support for S5PV210. Note. This patch is confirmed on SMDKV210 and SMDKC110 board.

---
Changes since v2:
1. Fixed comments as per commnets from Ben Dooks
2. Removed backup and restore function for VIC 2 and 3

Changes since v1:
1. Fixed comments as per comments from Ben Dooks
2. Removed redunt #if defined(CONFIG_PM)
3. Removed redunt including header files
4. Removed <mach/pm.h> and <plat/pm-s5p.h>
5. Moved 's5pv210_core_save' into machine directory
6. Moved sleep.S into machine directory for S5P SoCs compatibility
7. Added CF retension configuration when wake-up

 arch/arm/mach-s5pv210/Kconfig                   |    6 +
 arch/arm/mach-s5pv210/Makefile                  |    1 +
 arch/arm/mach-s5pv210/include/mach/pm-core.h    |   43 ++++++
 arch/arm/mach-s5pv210/include/mach/regs-clock.h |    7 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c           |    3 +
 arch/arm/mach-s5pv210/mach-smdkv210.c           |    3 +
 arch/arm/mach-s5pv210/pm.c                      |  166 ++++++++++++++++++++++
 arch/arm/mach-s5pv210/sleep.S                   |  171 +++++++++++++++++++++++
 arch/arm/plat-s5p/Makefile                      |    2 +
 arch/arm/plat-s5p/include/plat/irqs.h           |    1 +
 arch/arm/plat-s5p/irq-pm.c                      |   93 ++++++++++++
 arch/arm/plat-s5p/pm.c                          |   52 +++++++
 arch/arm/plat-samsung/pm-gpio.c                 |    4 +-
 13 files changed, 548 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h
 create mode 100644 arch/arm/mach-s5pv210/pm.c
 create mode 100644 arch/arm/mach-s5pv210/sleep.S
 create mode 100644 arch/arm/plat-s5p/irq-pm.c
 create mode 100644 arch/arm/plat-s5p/pm.c
arch/arm/mach-s5pv210/Kconfig +6 -0
index b46925b..6649170 100644
@@ -14,6 +14,7 @@ config CPU_S5PV210
 	select PLAT_S5P
 	select S3C_PL330_DMA
 	select S5P_EXT_INT
+	select S5PV210_PM if PM
 	help
 	  Enable S5PV210 CPU support
 
@@ -138,4 +139,9 @@ config MACH_SMDKV210
 
 endmenu
 
+config S5PV210_PM
+	bool
+	help
+	  Power Management code common to S5PV210
+
 endif
arch/arm/mach-s5pv210/Makefile +1 -0
index 7045489..c63c162 100644
@@ -14,6 +14,7 @@ obj-				:=
 
 obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o gpiolib.o
 obj-$(CONFIG_CPU_S5PV210)	+= setup-i2c0.o
+obj-$(CONFIG_S5PV210_PM)	+= pm.o sleep.o
 
 # machine support
 
arch/arm/mach-s5pv210/include/mach/pm-core.h new file +43 -0

43 lines not on this page · raw message

arch/arm/mach-s5pv210/include/mach/regs-clock.h +5 -2
index 499aef7..929fd3a 100644
@@ -95,7 +95,7 @@
 /* Registers related to power management */
 #define S5P_PWR_CFG		S5P_CLKREG(0xC000)
 #define S5P_EINT_WAKEUP_MASK	S5P_CLKREG(0xC004)
-#define S5P_WAKEUP_MASK 	S5P_CLKREG(0xC008)
+#define S5P_WAKEUP_MASK		S5P_CLKREG(0xC008)
 #define S5P_PWR_MODE		S5P_CLKREG(0xC00C)
 #define S5P_NORMAL_CFG		S5P_CLKREG(0xC010)
 #define S5P_IDLE_CFG		S5P_CLKREG(0xC020)
@@ -159,8 +159,11 @@
 #define S5P_SLEEP_CFG_USBOSC_EN		(1 << 1)
 
 /* OTHERS Resgister */
+#define S5P_OTHERS_RET_IO		(1 << 31)
+#define S5P_OTHERS_RET_CF		(1 << 30)
+#define S5P_OTHERS_RET_MMC		(1 << 29)
+#define S5P_OTHERS_RET_UART		(1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK		(1 << 16)
-#define S5P_OTHERS_MIPI_DPHY_EN		(1 << 28)
 
 /* MIPI */
 #define S5P_MIPI_DPHY_EN		(3)
arch/arm/mach-s5pv210/mach-smdkc110.c +3 -0
index 8211bb8..053b50d 100644
@@ -28,6 +28,7 @@
 #include <plat/cpu.h>
 #include <plat/ata.h>
 #include <plat/iic.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKC110_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -110,6 +111,8 @@ static void __init smdkc110_map_io(void)
 
 static void __init smdkc110_machine_init(void)
 {
+	s3c_pm_init();
+
 	s3c_i2c0_set_platdata(NULL);
 	s3c_i2c1_set_platdata(NULL);
 	s3c_i2c2_set_platdata(NULL);
arch/arm/mach-s5pv210/mach-smdkv210.c +3 -0
index fbbc0a3..5a9c79c 100644
@@ -31,6 +31,7 @@
 #include <plat/ata.h>
 #include <plat/iic.h>
 #include <plat/keypad.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define SMDKV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -145,6 +146,8 @@ static void __init smdkv210_map_io(void)
 
 static void __init smdkv210_machine_init(void)
 {
+	s3c_pm_init();
+
 	samsung_keypad_set_platdata(&smdkv210_keypad_data);
 	s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
arch/arm/mach-s5pv210/pm.c new file +166 -0

166 lines not on this page · raw message

arch/arm/mach-s5pv210/sleep.S new file +171 -0

171 lines not on this page · raw message

arch/arm/plat-s5p/Makefile +2 -0
index f3e917e..4b838f6 100644
@@ -18,6 +18,8 @@ obj-y				+= cpu.o
 obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
+obj-$(CONFIG_PM)		+= pm.o
+obj-$(CONFIG_PM)		+= irq-pm.o
 
 # devices
 
arch/arm/plat-s5p/include/plat/irqs.h +1 -0
index 3fb3a3a..2f8128a 100644
@@ -94,4 +94,5 @@
 						((irq) - S5P_EINT_BASE1) : \
 						((irq) + 16 - S5P_EINT_BASE2))
 
+#define IRQ_EINT_BIT(x)		EINT_OFFSET(x)
 #endif /* __ASM_PLAT_S5P_IRQS_H */
arch/arm/plat-s5p/irq-pm.c new file +93 -0

93 lines not on this page · raw message

arch/arm/plat-s5p/pm.c new file +52 -0

52 lines not on this page · raw message

arch/arm/plat-samsung/pm-gpio.c +2 -2
index 7df03f8..9652820 100644
@@ -192,7 +192,7 @@ struct s3c_gpio_pm s3c_gpio_pm_2bit = {
 	.resume = s3c_gpio_pm_2bit_resume,
 };
 
-#ifdef CONFIG_ARCH_S3C64XX
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
 {
 	chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -302,7 +302,7 @@ struct s3c_gpio_pm s3c_gpio_pm_4bit = {
 	.save	= s3c_gpio_pm_4bit_save,
 	.resume = s3c_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
 /**
  * s3c_pm_save_gpio() - save gpio chip data for suspend
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH v3 1/1 ARM: S5PV210: Add Power Management Support

Quoted 164 lines · Sangbeom Kim

From: Jongpill Lee <[email protected]>

This patch adds suspend-to-ram support for S5PV210. Note. This patch is confirmed on SMDKV210 and SMDKC110 board.

---
Changes since v2:
1. Fixed comments as per commnets from Ben Dooks
2. Removed backup and restore function for VIC 2 and 3

Changes since v1:
1. Fixed comments as per comments from Ben Dooks
2. Removed redunt #if defined(CONFIG_PM)
3. Removed redunt including header files
4. Removed <mach/pm.h> and <plat/pm-s5p.h>
5. Moved 's5pv210_core_save' into machine directory
6. Moved sleep.S into machine directory for S5P SoCs compatibility
7. Added CF retension configuration when wake-up

?arch/arm/mach-s5pv210/Kconfig ? ? ? ? ? ? ? ? ? | ? ?6 +
?arch/arm/mach-s5pv210/Makefile ? ? ? ? ? ? ? ? ?| ? ?1 +
?arch/arm/mach-s5pv210/include/mach/pm-core.h ? ?| ? 43 ++++++
?arch/arm/mach-s5pv210/include/mach/regs-clock.h | ? ?7 +-
?arch/arm/mach-s5pv210/mach-smdkc110.c ? ? ? ? ? | ? ?3 +
?arch/arm/mach-s5pv210/mach-smdkv210.c ? ? ? ? ? | ? ?3 +
?arch/arm/mach-s5pv210/pm.c ? ? ? ? ? ? ? ? ? ? ?| ?166 ++++++++++++++++++++++
?arch/arm/mach-s5pv210/sleep.S ? ? ? ? ? ? ? ? ? | ?171 +++++++++++++++++++++++
?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +
?arch/arm/plat-s5p/include/plat/irqs.h ? ? ? ? ? | ? ?1 +
?arch/arm/plat-s5p/irq-pm.c ? ? ? ? ? ? ? ? ? ? ?| ? 93 ++++++++++++
?arch/arm/plat-s5p/pm.c ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 52 +++++++
?arch/arm/plat-samsung/pm-gpio.c ? ? ? ? ? ? ? ? | ? ?4 +-

?13 files changed, 548 insertions(+), 4 deletions(-) ?create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h ?create mode 100644 arch/arm/mach-s5pv210/pm.c
?create mode 100644 arch/arm/mach-s5pv210/sleep.S ?create mode 100644 arch/arm/plat-s5p/irq-pm.c
?create mode 100644 arch/arm/plat-s5p/pm.c

arch/arm/mach-s5pv210/Kconfig +0 -0
index b46925b..6649170 100644
@@ -14,6 +14,7 @@ config CPU_S5PV210

? ? ? ?select PLAT_S5P
? ? ? ?select S3C_PL330_DMA
? ? ? ?select S5P_EXT_INT
+ ? ? ? select S5PV210_PM if PM
? ? ? ?help
? ? ? ? ?Enable S5PV210 CPU support

arch/arm/mach-s5pv210/Kconfig +0 -0
@@ -138,4 +139,9 @@ config MACH_SMDKV210
 

?endmenu

arch/arm/mach-s5pv210/Kconfig +5 -0
+config S5PV210_PM
+ ? ? ? bool
+ ? ? ? help
+ ? ? ? ? Power Management code common to S5PV210
+

?endif

arch/arm/mach-s5pv210/Makefile +0 -0
index 7045489..c63c162 100644
@@ -14,6 +14,7 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ?:=
 

?obj-$(CONFIG_CPU_S5PV210) ? ? ?+= cpu.o init.o clock.o dma.o gpiolib.o ?obj-$(CONFIG_CPU_S5PV210) ? ? ?+= setup-i2c0.o +obj-$(CONFIG_S5PV210_PM) ? ? ? += pm.o sleep.o

?# machine support

arch/arm/mach-s5pv210/include/mach/pm-core.h new file +43 -0
new file mode 100644
index 0000000..e8d394f
@@ -0,0 +1,43 @@
+/* linux/arch/arm/mach-s5pv210/include/mach/pm-core.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * Based on arch/arm/mach-s3c2410/include/mach/pm-core.h,
+ * Copyright 2008 Simtec Electronics
+ * ? ? ?Ben Dooks <[email protected]>
+ * ? ? ?http://armlinux.simtec.co.uk/
+ *
+ * S5PV210 - PM core support for arch/arm/plat-s5p/pm.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+static inline void s3c_pm_debug_init_uart(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_prepare_irqs(void)
+{
+ ? ? ? __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK);
+ ? ? ? __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK);
+}
+
+static inline void s3c_pm_arch_stop_clocks(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_show_resume_irqs(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_update_uart(void __iomem *regs,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct pm_uart_save *save)
+{
+ ? ? ? /* nothing here yet */
+}
arch/arm/mach-s5pv210/include/mach/regs-clock.h +0 -0
index 499aef7..929fd3a 100644
@@ -95,7 +95,7 @@

?/* Registers related to power management */ ?#define S5P_PWR_CFG ? ? ? ? ? ?S5P_CLKREG(0xC000) ?#define S5P_EINT_WAKEUP_MASK ? S5P_CLKREG(0xC004)

arch/arm/mach-s5pv210/include/mach/regs-clock.h +1 -1
-#define S5P_WAKEUP_MASK ? ? ? ?S5P_CLKREG(0xC008)
+#define S5P_WAKEUP_MASK ? ? ? ? ? ? ? ?S5P_CLKREG(0xC008)

?#define S5P_PWR_MODE ? ? ? ? ? S5P_CLKREG(0xC00C) ?#define S5P_NORMAL_CFG ? ? ? ? S5P_CLKREG(0xC010) ?#define S5P_IDLE_CFG ? ? ? ? ? S5P_CLKREG(0xC020)

arch/arm/mach-s5pv210/include/mach/regs-clock.h +0 -0
@@ -159,8 +159,11 @@
 ?#define S5P_SLEEP_CFG_USBOSC_EN ? ? ? ? ? ? ? ?(1 << 1)
 

?/* OTHERS Resgister */

arch/arm/mach-s5pv210/include/mach/regs-clock.h +4 -0
+#define S5P_OTHERS_RET_IO ? ? ? ? ? ? ?(1 << 31)
+#define S5P_OTHERS_RET_CF ? ? ? ? ? ? ?(1 << 30)
+#define S5P_OTHERS_RET_MMC ? ? ? ? ? ? (1 << 29)
+#define S5P_OTHERS_RET_UART ? ? ? ? ? ?(1 << 28)

?#define S5P_OTHERS_USB_SIG_MASK ? ? ? ? ? ? ? ?(1 << 16) -#define S5P_OTHERS_MIPI_DPHY_EN ? ? ? ? ? ? ? ?(1 << 28)

?/* MIPI */
?#define S5P_MIPI_DPHY_EN ? ? ? ? ? ? ? (3)

arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0
index 8211bb8..053b50d 100644
@@ -28,6 +28,7 @@

?#include <plat/cpu.h>
?#include <plat/ata.h>
?#include <plat/iic.h>
+#include <plat/pm.h>

?/* Following are default values for UCON, ULCON and UFCON UART registers */ ?#define SMDKC110_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\

arch/arm/mach-s5pv210/mach-smdkc110.c static void __init smdkc110_map_io(void) · line 114

Quoted 4 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
@@ -110,6 +111,8 @@ static void __init smdkc110_map_io(void)
 
 ?static void __init smdkc110_machine_init(void)
 ?{
+ ? ? ? s3c_pm_init();

Umm How about to add the cpu common code. e.g., mach-s5pv210/cpu.c? If chip support the pm feature. why not use it for each board?

Quoted 335 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
+
 ? ? ? ?s3c_i2c0_set_platdata(NULL);
 ? ? ? ?s3c_i2c1_set_platdata(NULL);
 ? ? ? ?s3c_i2c2_set_platdata(NULL);
arch/arm/mach-s5pv210/mach-smdkv210.c +0 -0
index fbbc0a3..5a9c79c 100644
@@ -31,6 +31,7 @@

?#include <plat/ata.h>
?#include <plat/iic.h>
?#include <plat/keypad.h>
+#include <plat/pm.h>

?/* Following are default values for UCON, ULCON and UFCON UART registers */ ?#define SMDKV210_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\

arch/arm/mach-s5pv210/mach-smdkv210.c +2 -0
@@ -145,6 +146,8 @@ static void __init smdkv210_map_io(void)
 
 ?static void __init smdkv210_machine_init(void)
 ?{
+ ? ? ? s3c_pm_init();
+
 ? ? ? ?samsung_keypad_set_platdata(&smdkv210_keypad_data);
 ? ? ? ?s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
arch/arm/mach-s5pv210/pm.c new file +166 -0
new file mode 100644
index 0000000..549d792
@@ -0,0 +1,166 @@
+/* linux/arch/arm/mach-s5pv210/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5PV210 - Power Management support
+ *
+ * Based on arch/arm/mach-s3c2410/pm.c
+ * Copyright (c) 2006 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/io.h>
+
+#include <plat/cpu.h>
+#include <plat/pm.h>
+#include <plat/regs-timer.h>
+
+#include <mach/regs-irq.h>
+#include <mach/regs-clock.h>
+
+static struct sleep_save s5pv210_core_save[] = {
+ ? ? ? /* Clock source */
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC0),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC1),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC2),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC3),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC4),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC5),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC6),
+
+ ? ? ? /* Clock source Mask */
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC_MASK0),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC_MASK1),
+
+ ? ? ? /* Clock Divider */
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV0),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV1),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV2),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV3),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV4),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV5),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV6),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV7),
+
+ ? ? ? /* Clock Main Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN1),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN2),
+
+ ? ? ? /* Clock source Peri Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_PERI0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_PERI1),
+
+ ? ? ? /* Clock source SCLK Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_SCLK0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_SCLK1),
+
+ ? ? ? /* Clock IP Clock gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP1),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP2),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP3),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP4),
+
+ ? ? ? /* Clock Blcok and Bus gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_BLOCK),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_BUS0),
+
+ ? ? ? /* Clock ETC */
+ ? ? ? SAVE_ITEM(S5P_CLK_OUT),
+ ? ? ? SAVE_ITEM(S5P_MDNIE_SEL),
+
+ ? ? ? /* PWM Register */
+ ? ? ? SAVE_ITEM(S3C2410_TCFG0),
+ ? ? ? SAVE_ITEM(S3C2410_TCFG1),
+ ? ? ? SAVE_ITEM(S3C64XX_TINT_CSTAT),
+ ? ? ? SAVE_ITEM(S3C2410_TCON),
+ ? ? ? SAVE_ITEM(S3C2410_TCNTB(0)),
+ ? ? ? SAVE_ITEM(S3C2410_TCMPB(0)),
+ ? ? ? SAVE_ITEM(S3C2410_TCNTO(0)),
+};
+
+void s5pv210_cpu_suspend(void)
+{
+ ? ? ? unsigned long tmp;
+
+ ? ? ? /* issue the standby signal into the pm unit. Note, we
+ ? ? ? ?* issue a write-buffer drain just in case */
+
+ ? ? ? tmp = 0;
+
+ ? ? ? asm("b 1f\n\t"
+ ? ? ? ? ? ".align 5\n\t"
+ ? ? ? ? ? "1:\n\t"
+ ? ? ? ? ? "mcr p15, 0, %0, c7, c10, 5\n\t"
+ ? ? ? ? ? "mcr p15, 0, %0, c7, c10, 4\n\t"
+ ? ? ? ? ? "wfi" : : "r" (tmp));
+
+ ? ? ? /* we should never get past here */
+ ? ? ? panic("sleep resumed to originator?");
+}
+
+static void s5pv210_pm_prepare(void)
+{
+ ? ? ? unsigned int tmp;
+
+ ? ? ? /* ensure at least INFORM0 has the resume address */
+ ? ? ? __raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
+
+ ? ? ? tmp = __raw_readl(S5P_SLEEP_CFG);
+ ? ? ? tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
+ ? ? ? __raw_writel(tmp, S5P_SLEEP_CFG);
+
+ ? ? ? /* WFI for SLEEP mode configuration by SYSCON */
+ ? ? ? tmp = __raw_readl(S5P_PWR_CFG);
+ ? ? ? tmp &= S5P_CFG_WFI_CLEAN;
+ ? ? ? tmp |= S5P_CFG_WFI_SLEEP;
+ ? ? ? __raw_writel(tmp, S5P_PWR_CFG);
+
+ ? ? ? /* SYSCON interrupt handling disable */
+ ? ? ? tmp = __raw_readl(S5P_OTHERS);
+ ? ? ? tmp |= S5P_OTHER_SYSC_INTOFF;
+ ? ? ? __raw_writel(tmp, S5P_OTHERS);
+
+ ? ? ? s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
+}
+
+static int s5pv210_pm_add(struct sys_device *sysdev)
+{
+ ? ? ? pm_cpu_prep = s5pv210_pm_prepare;
+ ? ? ? pm_cpu_sleep = s5pv210_cpu_suspend;
+
+ ? ? ? return 0;
+}
+
+static int s5pv210_pm_resume(struct sys_device *dev)
+{
+ ? ? ? u32 tmp;
+
+ ? ? ? tmp = __raw_readl(S5P_OTHERS);
+ ? ? ? tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\
+ ? ? ? ? ? ? ? S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);
+ ? ? ? __raw_writel(tmp , S5P_OTHERS);
+
+ ? ? ? s3c_pm_do_restore_core(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
+
+ ? ? ? return 0;
+}
+
+static struct sysdev_driver s5pv210_pm_driver = {
+ ? ? ? .add ? ? ? ? ? ?= s5pv210_pm_add,
+ ? ? ? .resume ? ? ? ? = s5pv210_pm_resume,
+};
+
+static __init int s5pv210_pm_drvinit(void)
+{
+ ? ? ? return sysdev_driver_register(&s5pv210_sysclass, &s5pv210_pm_driver);
+}
+arch_initcall(s5pv210_pm_drvinit);
arch/arm/mach-s5pv210/sleep.S new file +132 -0
new file mode 100644
index 0000000..4124fd4
@@ -0,0 +1,171 @@
+/* linux/arch/arm/plat-s5p/sleep.S
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5PV210 power Manager (Suspend-To-RAM) support
+ * Based on S3C2410 sleep code by:
+ * ? ? Ben Dooks, (c) 2004 Simtec Electronics
+ *
+ * Based on PXA/SA1100 sleep code by:
+ * ? ? Nicolas Pitre, (c) 2002 Monta Vista Software Inc
+ * ? ? Cliff Brake, (c) 2001
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ?02111-1307 ?USA
+*/
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/memory.h>
+
+ ? ? ? .text
+
+ ? ? ? /* s3c_cpu_save
+ ? ? ? ?*
+ ? ? ? ?* entry:
+ ? ? ? ?* ? ? ?r0 = save address (virtual addr of s3c_sleep_save_phys)
+ ? ? ? */
+
+ENTRY(s3c_cpu_save)
+
+ ? ? ? stmfd ? sp!, { r3 - r12, lr }
+
+ ? ? ? mrc ? ? p15, 0, r4, c13, c0, 0 ?@ FCSE/PID
+ ? ? ? mrc ? ? p15, 0, r5, c3, c0, 0 ? @ Domain ID
+ ? ? ? mrc ? ? p15, 0, r6, c2, c0, 0 ? @ Translation Table BASE0
+ ? ? ? mrc ? ? p15, 0, r7, c2, c0, 1 ? @ Translation Table BASE1
+ ? ? ? mrc ? ? p15, 0, r8, c2, c0, 2 ? @ Translation Table Control
+ ? ? ? mrc ? ? p15, 0, r9, c1, c0, 0 ? @ Control register
+ ? ? ? mrc ? ? p15, 0, r10, c1, c0, 1 ?@ Auxiliary control register
+ ? ? ? mrc ? ? p15, 0, r11, c1, c0, 2 ?@ Co-processor access controls
+ ? ? ? mrc ? ? p15, 0, r12, c10, c2, 0 @ Read PRRR
+ ? ? ? mrc ? ? p15, 0, r3, c10, c2, 1 ?@ READ NMRR
+
+ ? ? ? stmia ? r0, { r3 - r13 }
+
+ ? ? ? bl ? ? ?s3c_pm_cb_flushcache
+
+ ? ? ? ldr ? ? r0, =pm_cpu_sleep
+ ? ? ? ldr ? ? r0, [ r0 ]
+ ? ? ? mov ? ? pc, r0
+
+resume_with_mmu:
+ ? ? ? /*
+ ? ? ? ?* After MMU is turned on, restore the previous MMU table.
+ ? ? ? ?*/
+ ? ? ? ldr ? ? r9 , =(PAGE_OFFSET - PHYS_OFFSET)
+ ? ? ? add ? ? r4, r4, r9
+ ? ? ? str ? ? r12, [r4]
+
+ ? ? ? ldmfd ? sp!, { r3 - r12, pc }
+
+ ? ? ? .ltorg
+
+ ? ? ? .data
+
+ ? ? ? .global s3c_sleep_save_phys
+s3c_sleep_save_phys:
+ ? ? ? .word ? 0
+
+ ? ? ? /* sleep magic, to allow the bootloader to check for an valid
+ ? ? ? ?* image to resume to. Must be the first word before the
+ ? ? ? ?* s3c_cpu_resume entry.
+ ? ? ? */
+
+ ? ? ? .word ? 0x2bedf00d
+
+ ? ? ? /* s3c_cpu_resume
+ ? ? ? ?*
+ ? ? ? ?* resume code entry for bootloader to call
+ ? ? ? ?*
+ ? ? ? ?* we must put this code here in the data segment as we have no
+ ? ? ? ?* other way of restoring the stack pointer after sleep, and we
+ ? ? ? ?* must not write to the code segment (code is read-only)
+ ? ? ? */
+
+ENTRY(s3c_cpu_resume)
+ ? ? ? mov ? ? r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
+ ? ? ? msr ? ? cpsr_c, r0
+
+ ? ? ? mov ? ? r1, #0
+ ? ? ? mcr ? ? p15, 0, r1, c8, c7, 0 ? ? ? ? ? @ invalidate TLBs
+ ? ? ? mcr ? ? p15, 0, r1, c7, c5, 0 ? ? ? ? ? @ invalidate I Cache
+
+ ? ? ? ldr ? ? r0, s3c_sleep_save_phys ? ? ? ? @ address of restore block
+ ? ? ? ldmia ? r0, { r3 - r13 }
+
+ ? ? ? mcr ? ? p15, 0, r4, c13, c0, 0 ? ? ? ? ?@ FCSE/PID
+ ? ? ? mcr ? ? p15, 0, r5, c3, c0, 0 ? ? ? ? ? @ Domain ID
+
+ ? ? ? mcr ? ? p15, 0, r8, c2, c0, 2 ? ? ? ? ? @ Translation Table Control
+ ? ? ? mcr ? ? p15, 0, r7, c2, c0, 1 ? ? ? ? ? @ Translation Table BASE1
+ ? ? ? mcr ? ? p15, 0, r6, c2, c0, 0 ? ? ? ? ? @ Translation Table BASE0
+
+ ? ? ? mcr ? ? p15, 0, r10, c1, c0, 1 ? ? ? ? ?@ Auxiliary control register
+
+ ? ? ? mov ? ? r0, #0
+ ? ? ? mcr ? ? p15, 0, r0, c8, c7, 0 ? ? ? ? ? @ Invalidate I & D TLB
+
+ ? ? ? mov ? ? r0, #0 ? ? ? ? ? ? ? ? ? ? ? ? ?@ restore copro access
+ ? ? ? mcr ? ? p15, 0, r11, c1, c0, 2 ? ? ? ? ?@ Co-processor access
+ ? ? ? mcr ? ? p15, 0, r0, c7, c5, 4
+
+ ? ? ? mcr ? ? p15, 0, r12, c10, c2, 0 ? ? ? ? @ write PRRR
+ ? ? ? mcr ? ? p15, 0, r3, c10, c2, 1 ? ? ? ? ?@ write NMRR
+
+ ? ? ? /*
+ ? ? ? ?* In Cortex-A8, when MMU is turned on, the pipeline is flushed.
+ ? ? ? ?* And there are no valid entries in the MMU table at this point.
+ ? ? ? ?* So before turning on the MMU, the MMU entry for the DRAM address
+ ? ? ? ?* range is added. After the MMU is turned on, the other entries

arch/arm/mach-s5pv210/sleep.S line 142

Quoted 10 lines
arch/arm/mach-s5pv210/sleep.S new file +10 -0
+ ? ? ? ?* in the MMU table will be restored.
+ ? ? ? */
+
+ ? ? ? /* r6 = Translation Table BASE0 */
+ ? ? ? mov ? ? r4, r6
+ ? ? ? mov ? ? r4, r4, LSR #14
+ ? ? ? mov ? ? r4, r4, LSL #14
+
+ ? ? ? /* Load address for adding to MMU table list */
+ ? ? ? ldr ? ? r11, =0xE010F000

what's the address 0xE010F000?

Quoted 37 lines
arch/arm/mach-s5pv210/sleep.S new file +29 -0
+ ? ? ? ldr ? ? r10, [r11, #0]
+ ? ? ? mov ? ? r10, r10, LSR #18
+ ? ? ? bic ? ? r10, r10, #0x3
+ ? ? ? orr ? ? r4, r4, r10
+
+ ? ? ? /* Calculate MMU table entry */
+ ? ? ? mov ? ? r10, r10, LSL #18
+ ? ? ? ldr ? ? r5, =0x40E
+ ? ? ? orr ? ? r10, r10, r5
+
+ ? ? ? /* Back up originally data */
+ ? ? ? ldr ? ? r12, [r4]
+
+ ? ? ? /* Add calculated MMU table entry into MMU table list */
+ ? ? ? str ? ? r10, [r4]
+
+ ? ? ? ldr ? ? r2, =resume_with_mmu
+ ? ? ? mcr ? ? p15, 0, r9, c1, c0, 0 ? ? ? ? ? @ turn on MMU, etc
+
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? @ second-to-last before mmu
+
+ ? ? ? mov ? ? pc, r2 ? ? ? ? ? ? ? ? ? ? ? ? ?@ go back to virtual address
+
+ ? ? ? .ltorg
+
arch/arm/plat-s5p/Makefile +0 -0
index f3e917e..4b838f6 100644
@@ -18,6 +18,8 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? += cpu.o

?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o
?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
?obj-$(CONFIG_S5P_EXT_INT) ? ? ?+= irq-eint.o

arch/arm/plat-s5p/Makefile

Quoted 2 lines
arch/arm/plat-s5p/Makefile +2 -0
+obj-$(CONFIG_PM) ? ? ? ? ? ? ? += pm.o
+obj-$(CONFIG_PM) ? ? ? ? ? ? ? += irq-pm.o

Please make one line.

arch/arm/plat-s5p/include/plat/irqs.h line 97

Quoted 12 lines

?# devices

arch/arm/plat-s5p/include/plat/irqs.h +1 -0
index 3fb3a3a..2f8128a 100644
@@ -94,4 +94,5 @@
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?((irq) - S5P_EINT_BASE1) : \
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?((irq) + 16 - S5P_EINT_BASE2))
 
+#define IRQ_EINT_BIT(x) ? ? ? ? ? ? ? ?EINT_OFFSET(x)

where use it?

Quoted 188 lines

?#endif /* __ASM_PLAT_S5P_IRQS_H */

arch/arm/plat-s5p/irq-pm.c new file +93 -0
new file mode 100644
index 0000000..dc33b9e
@@ -0,0 +1,93 @@
+/* linux/arch/arm/plat-s5p/irq-pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * Based on arch/arm/plat-s3c24xx/irq-pm.c,
+ * Copyright (c) 2003,2004 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ * ? ? http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/sysdev.h>
+
+#include <plat/cpu.h>
+#include <plat/irqs.h>
+#include <plat/pm.h>
+#include <mach/map.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/regs-irq.h>
+
+/* state for IRQs over sleep */
+
+/* default is to allow for EINT0..EINT31, and IRQ_RTC_TIC, IRQ_RTC_ALARM,
+ * as wakeup sources
+ *
+ * set bit to 1 in allow bitfield to enable the wakeup settings on it
+*/
+
+unsigned long s3c_irqwake_intallow ? ? = 0x00000006L;
+unsigned long s3c_irqwake_eintallow ? ?= 0xffffffffL;
+
+int s3c_irq_wake(unsigned int irqno, unsigned int state)
+{
+ ? ? ? unsigned long irqbit;
+
+ ? ? ? switch (irqno) {
+ ? ? ? case IRQ_RTC_TIC:
+ ? ? ? case IRQ_RTC_ALARM:
+ ? ? ? ? ? ? ? irqbit = 1 << (irqno + 1 - IRQ_RTC_ALARM);
+ ? ? ? ? ? ? ? if (!state)
+ ? ? ? ? ? ? ? ? ? ? ? s3c_irqwake_intmask |= irqbit;
+ ? ? ? ? ? ? ? else
+ ? ? ? ? ? ? ? ? ? ? ? s3c_irqwake_intmask &= ~irqbit;
+ ? ? ? ? ? ? ? break;
+ ? ? ? default:
+ ? ? ? ? ? ? ? return -ENOENT;
+ ? ? ? }
+ ? ? ? return 0;
+}
+
+static struct sleep_save eint_save[] = {
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(3)),
+
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(3)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(4)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(5)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(6)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(7)),
+
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(3)),
+};
+
+int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+{
+ ? ? ? s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
+
+ ? ? ? return 0;
+}
+
+int s3c24xx_irq_resume(struct sys_device *dev)
+{
+ ? ? ? s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
+
+ ? ? ? return 0;
+}
+
arch/arm/plat-s5p/pm.c new file +52 -0
new file mode 100644
index 0000000..d592b63
@@ -0,0 +1,52 @@
+/* linux/arch/arm/plat-s5p/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5P Power Manager (Suspend-To-RAM) support
+ *
+ * Based on arch/arm/plat-s3c24xx/pm.c
+ * Copyright (c) 2004,2006 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/suspend.h>
+#include <plat/pm.h>
+
+#define PFX "s5p pm: "
+
+/* s3c_pm_check_resume_pin
+ *
+ * check to see if the pin is configured correctly for sleep mode, and
+ * make any necessary adjustments if it is not
+*/
+
+static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
+{
+ ? ? ? /* nothing here yet */
+}
+
+/* s3c_pm_configure_extint
+ *
+ * configure all external interrupt pins
+*/
+
+void s3c_pm_configure_extint(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+void s3c_pm_restore_core(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+void s3c_pm_save_core(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
arch/arm/plat-samsung/pm-gpio.c +2 -2
index 7df03f8..9652820 100644
@@ -192,7 +192,7 @@ struct s3c_gpio_pm s3c_gpio_pm_2bit = {
 ? ? ? ?.resume = s3c_gpio_pm_2bit_resume,
 ?};
 
-#ifdef CONFIG_ARCH_S3C64XX
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 ?static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
 ?{
 ? ? ? ?chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -302,7 +302,7 @@ struct s3c_gpio_pm s3c_gpio_pm_4bit = {
 ? ? ? ?.save ? = s3c_gpio_pm_4bit_save,
 ? ? ? ?.resume = s3c_gpio_pm_4bit_resume,
 ?};
-#endif /* CONFIG_ARCH_S3C64XX */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 

?/**
?* s3c_pm_save_gpio() - save gpio chip data for suspend --
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

#2 lore raw

PATCH v3 1/1 ARM: S5PV210: Add Power Management Support

Quoted 174 lines · Kyungmin Park
Quoted 22 lines · Sangbeom Kim

From: Jongpill Lee <[email protected]>

This patch adds suspend-to-ram support for S5PV210. Note. This patch is confirmed on SMDKV210 and SMDKC110 board.

---
Changes since v2:
1. Fixed comments as per commnets from Ben Dooks
2. Removed backup and restore function for VIC 2 and 3

Changes since v1:
1. Fixed comments as per comments from Ben Dooks
2. Removed redunt #if defined(CONFIG_PM)
3. Removed redunt including header files
4. Removed <mach/pm.h> and <plat/pm-s5p.h>
5. Moved 's5pv210_core_save' into machine directory
6. Moved sleep.S into machine directory for S5P SoCs compatibility
7. Added CF retension configuration when wake-up

Quoted 7 lines
 arch/arm/mach-s5pv210/Kconfig                   |    6 +
 arch/arm/mach-s5pv210/Makefile                  |    1 +
 arch/arm/mach-s5pv210/include/mach/pm-core.h    |   43 ++++++
 arch/arm/mach-s5pv210/include/mach/regs-clock.h |    7 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c           |    3 +
 arch/arm/mach-s5pv210/mach-smdkv210.c           |    3 +
 arch/arm/mach-s5pv210/pm.c                      |  166

++++++++++++++++++++++

Quoted 1 line
 arch/arm/mach-s5pv210/sleep.S                   |  171

+++++++++++++++++++++++

arch/arm/mach-

Quoted 13 lines
 arch/arm/plat-s5p/Makefile                      |    2 +
 arch/arm/plat-s5p/include/plat/irqs.h           |    1 +
 arch/arm/plat-s5p/irq-pm.c                      |   93 ++++++++++++
 arch/arm/plat-s5p/pm.c                          |   52 +++++++
 arch/arm/plat-samsung/pm-gpio.c                 |    4 +-
 13 files changed, 548 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h
 create mode 100644 arch/arm/mach-s5pv210/pm.c
 create mode 100644 arch/arm/mach-s5pv210/sleep.S
 create mode 100644 arch/arm/plat-s5p/irq-pm.c
 create mode 100644 arch/arm/plat-s5p/pm.c
arch/arm/mach- renamed from arch/arm/mach-s5pv210/Kconfig +0 -0

s5pv210/Kconfig

arch/arm/mach-

Quoted 22 lines

index b46925b..6649170 100644

arch/arm/mach-s5pv210/Kconfig +6 -0
@@ -14,6 +14,7 @@ config CPU_S5PV210
       select PLAT_S5P
       select S3C_PL330_DMA
       select S5P_EXT_INT
+       select S5PV210_PM if PM
       help
         Enable S5PV210 CPU support
 
@@ -138,4 +139,9 @@ config MACH_SMDKV210
 
 endmenu
 
+config S5PV210_PM
+       bool
+       help
+         Power Management code common to S5PV210
+
 endif
arch/arm/mach- renamed from arch/arm/mach-s5pv210/Makefile +0 -0

s5pv210/Makefile

Review

Quoted 12 lines

index 7045489..c63c162 100644

arch/arm/mach-s5pv210/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-                          :=
 
 obj-$(CONFIG_CPU_S5PV210)      += cpu.o init.o clock.o dma.o gpiolib.o
 obj-$(CONFIG_CPU_S5PV210)      += setup-i2c0.o
+obj-$(CONFIG_S5PV210_PM)       += pm.o sleep.o
 
 # machine support
 
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/pm-core.h

Review

Quoted 49 lines

new file mode 100644
index 0000000..e8d394f

arch/arm/mach-s5pv210/include/mach/pm-core.h new file +43 -0
@@ -0,0 +1,43 @@
+/* linux/arch/arm/mach-s5pv210/include/mach/pm-core.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * Based on arch/arm/mach-s3c2410/include/mach/pm-core.h,
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <[email protected]>
+ *      http://armlinux.simtec.co.uk/
+ *
+ * S5PV210 - PM core support for arch/arm/plat-s5p/pm.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+static inline void s3c_pm_debug_init_uart(void)
+{
+       /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_prepare_irqs(void)
+{
+       __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK);
+       __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK);
+}
+
+static inline void s3c_pm_arch_stop_clocks(void)
+{
+       /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_show_resume_irqs(void)
+{
+       /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_update_uart(void __iomem *regs,
+                                          struct pm_uart_save *save)
+{
+       /* nothing here yet */
+}
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/regs-clock.h

arch/arm/mach-

Quoted 26 lines

index 499aef7..929fd3a 100644

arch/arm/mach-s5pv210/include/mach/regs-clock.h +5 -2
@@ -95,7 +95,7 @@
 /* Registers related to power management */
 #define S5P_PWR_CFG            S5P_CLKREG(0xC000)
 #define S5P_EINT_WAKEUP_MASK   S5P_CLKREG(0xC004)
-#define S5P_WAKEUP_MASK        S5P_CLKREG(0xC008)
+#define S5P_WAKEUP_MASK                S5P_CLKREG(0xC008)
 #define S5P_PWR_MODE           S5P_CLKREG(0xC00C)
 #define S5P_NORMAL_CFG         S5P_CLKREG(0xC010)
 #define S5P_IDLE_CFG           S5P_CLKREG(0xC020)
@@ -159,8 +159,11 @@
 #define S5P_SLEEP_CFG_USBOSC_EN                (1 << 1)
 
 /* OTHERS Resgister */
+#define S5P_OTHERS_RET_IO              (1 << 31)
+#define S5P_OTHERS_RET_CF              (1 << 30)
+#define S5P_OTHERS_RET_MMC             (1 << 29)
+#define S5P_OTHERS_RET_UART            (1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK                (1 << 16)
-#define S5P_OTHERS_MIPI_DPHY_EN                (1 << 28)
 
 /* MIPI */
 #define S5P_MIPI_DPHY_EN               (3)
arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0

s5pv210/mach-smdkc110.c

arch/arm/mach-s5pv210/mach-smdkc110.c line 33

Quoted 10 lines

index 8211bb8..053b50d 100644

arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
@@ -28,6 +28,7 @@
 #include <plat/cpu.h>
 #include <plat/ata.h>
 #include <plat/iic.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers

*/

Quoted 3 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0
 #define SMDKC110_UCON_DEFAULT  (S3C2410_UCON_TXILEVEL |        \
@@ -110,6 +111,8 @@ static void __init smdkc110_map_io(void)
 
Quoted 6 lines

arch/arm/mach-s5pv210/mach-smdkc110.c static void __init smdkc110_map_io(void) · line 114

Quoted 3 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
 static void __init smdkc110_machine_init(void)
 {
+       s3c_pm_init();

Umm How about to add the cpu common code. e.g., mach-s5pv210/cpu.c? If chip support the pm feature. why not use it for each board?

This issue has been discussed before.
I followed Ben's comment.
its operation depends on machine.

Quoted 341 lines

arch/arm/mach-

Quoted 5 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
+
       s3c_i2c0_set_platdata(NULL);
       s3c_i2c1_set_platdata(NULL);
       s3c_i2c2_set_platdata(NULL);
arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-smdkv210.c +0 -0

s5pv210/mach-smdkv210.c

arch/arm/mach-s5pv210/mach-smdkv210.c line 36

Quoted 10 lines

index fbbc0a3..5a9c79c 100644

arch/arm/mach-s5pv210/mach-smdkv210.c +1 -0
@@ -31,6 +31,7 @@
 #include <plat/ata.h>
 #include <plat/iic.h>
 #include <plat/keypad.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers

*/

Quoted 158 lines
arch/arm/mach-s5pv210/mach-smdkv210.c +2 -0
 #define SMDKV210_UCON_DEFAULT  (S3C2410_UCON_TXILEVEL |        \
@@ -145,6 +146,8 @@ static void __init smdkv210_map_io(void)
 
 static void __init smdkv210_machine_init(void)
 {
+       s3c_pm_init();
+
       samsung_keypad_set_platdata(&smdkv210_keypad_data);
       s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
arch/arm/mach-s5pv210/pm.c new file +142 -0
new file mode 100644
index 0000000..549d792
@@ -0,0 +1,166 @@
+/* linux/arch/arm/mach-s5pv210/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * S5PV210 - Power Management support
+ *
+ * Based on arch/arm/mach-s3c2410/pm.c
+ * Copyright (c) 2006 Simtec Electronics
+ *     Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/io.h>
+
+#include <plat/cpu.h>
+#include <plat/pm.h>
+#include <plat/regs-timer.h>
+
+#include <mach/regs-irq.h>
+#include <mach/regs-clock.h>
+
+static struct sleep_save s5pv210_core_save[] = {
+       /* Clock source */
+       SAVE_ITEM(S5P_CLK_SRC0),
+       SAVE_ITEM(S5P_CLK_SRC1),
+       SAVE_ITEM(S5P_CLK_SRC2),
+       SAVE_ITEM(S5P_CLK_SRC3),
+       SAVE_ITEM(S5P_CLK_SRC4),
+       SAVE_ITEM(S5P_CLK_SRC5),
+       SAVE_ITEM(S5P_CLK_SRC6),
+
+       /* Clock source Mask */
+       SAVE_ITEM(S5P_CLK_SRC_MASK0),
+       SAVE_ITEM(S5P_CLK_SRC_MASK1),
+
+       /* Clock Divider */
+       SAVE_ITEM(S5P_CLK_DIV0),
+       SAVE_ITEM(S5P_CLK_DIV1),
+       SAVE_ITEM(S5P_CLK_DIV2),
+       SAVE_ITEM(S5P_CLK_DIV3),
+       SAVE_ITEM(S5P_CLK_DIV4),
+       SAVE_ITEM(S5P_CLK_DIV5),
+       SAVE_ITEM(S5P_CLK_DIV6),
+       SAVE_ITEM(S5P_CLK_DIV7),
+
+       /* Clock Main Gate */
+       SAVE_ITEM(S5P_CLKGATE_MAIN0),
+       SAVE_ITEM(S5P_CLKGATE_MAIN1),
+       SAVE_ITEM(S5P_CLKGATE_MAIN2),
+
+       /* Clock source Peri Gate */
+       SAVE_ITEM(S5P_CLKGATE_PERI0),
+       SAVE_ITEM(S5P_CLKGATE_PERI1),
+
+       /* Clock source SCLK Gate */
+       SAVE_ITEM(S5P_CLKGATE_SCLK0),
+       SAVE_ITEM(S5P_CLKGATE_SCLK1),
+
+       /* Clock IP Clock gate */
+       SAVE_ITEM(S5P_CLKGATE_IP0),
+       SAVE_ITEM(S5P_CLKGATE_IP1),
+       SAVE_ITEM(S5P_CLKGATE_IP2),
+       SAVE_ITEM(S5P_CLKGATE_IP3),
+       SAVE_ITEM(S5P_CLKGATE_IP4),
+
+       /* Clock Blcok and Bus gate */
+       SAVE_ITEM(S5P_CLKGATE_BLOCK),
+       SAVE_ITEM(S5P_CLKGATE_BUS0),
+
+       /* Clock ETC */
+       SAVE_ITEM(S5P_CLK_OUT),
+       SAVE_ITEM(S5P_MDNIE_SEL),
+
+       /* PWM Register */
+       SAVE_ITEM(S3C2410_TCFG0),
+       SAVE_ITEM(S3C2410_TCFG1),
+       SAVE_ITEM(S3C64XX_TINT_CSTAT),
+       SAVE_ITEM(S3C2410_TCON),
+       SAVE_ITEM(S3C2410_TCNTB(0)),
+       SAVE_ITEM(S3C2410_TCMPB(0)),
+       SAVE_ITEM(S3C2410_TCNTO(0)),
+};
+
+void s5pv210_cpu_suspend(void)
+{
+       unsigned long tmp;
+
+       /* issue the standby signal into the pm unit. Note, we
+        * issue a write-buffer drain just in case */
+
+       tmp = 0;
+
+       asm("b 1f\n\t"
+           ".align 5\n\t"
+           "1:\n\t"
+           "mcr p15, 0, %0, c7, c10, 5\n\t"
+           "mcr p15, 0, %0, c7, c10, 4\n\t"
+           "wfi" : : "r" (tmp));
+
+       /* we should never get past here */
+       panic("sleep resumed to originator?");
+}
+
+static void s5pv210_pm_prepare(void)
+{
+       unsigned int tmp;
+
+       /* ensure at least INFORM0 has the resume address */
+       __raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
+
+       tmp = __raw_readl(S5P_SLEEP_CFG);
+       tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
+       __raw_writel(tmp, S5P_SLEEP_CFG);
+
+       /* WFI for SLEEP mode configuration by SYSCON */
+       tmp = __raw_readl(S5P_PWR_CFG);
+       tmp &= S5P_CFG_WFI_CLEAN;
+       tmp |= S5P_CFG_WFI_SLEEP;
+       __raw_writel(tmp, S5P_PWR_CFG);
+
+       /* SYSCON interrupt handling disable */
+       tmp = __raw_readl(S5P_OTHERS);
+       tmp |= S5P_OTHER_SYSC_INTOFF;
+       __raw_writel(tmp, S5P_OTHERS);
+
+       s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
+}
+
+static int s5pv210_pm_add(struct sys_device *sysdev)
+{
+       pm_cpu_prep = s5pv210_pm_prepare;
+       pm_cpu_sleep = s5pv210_cpu_suspend;
+
+       return 0;
+}
+

arch/arm/mach-s5pv210/pm.c line 152

Quoted 10 lines
arch/arm/mach-s5pv210/pm.c new file +10 -0
+static int s5pv210_pm_resume(struct sys_device *dev)
+{
+       u32 tmp;
+
+       tmp = __raw_readl(S5P_OTHERS);
+       tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\
+               S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);
+       __raw_writel(tmp , S5P_OTHERS);
+
+       s3c_pm_do_restore_core(s5pv210_core_save,

ARRAY_SIZE(s5pv210_core_save));

arch/arm/mach-s5pv210/pm.c

Quoted 12 lines
arch/arm/mach-s5pv210/pm.c new file +12 -0
+
+       return 0;
+}
+
+static struct sysdev_driver s5pv210_pm_driver = {
+       .add            = s5pv210_pm_add,
+       .resume         = s5pv210_pm_resume,
+};
+
+static __init int s5pv210_pm_drvinit(void)
+{
+       return sysdev_driver_register(&s5pv210_sysclass,

&s5pv210_pm_driver);

arch/arm/mach-

Quoted 3 lines
arch/arm/mach-s5pv210/pm.c new file +2 -0
+}
+arch_initcall(s5pv210_pm_drvinit);
arch/arm/mach- renamed from arch/arm/mach-s5pv210/sleep.S +0 -0

s5pv210/sleep.S

Quoted 21 lines

new file mode 100644
index 0000000..4124fd4

arch/arm/mach-s5pv210/sleep.S new file +16 -0
@@ -0,0 +1,171 @@
+/* linux/arch/arm/plat-s5p/sleep.S
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * S5PV210 power Manager (Suspend-To-RAM) support
+ * Based on S3C2410 sleep code by:
+ *     Ben Dooks, (c) 2004 Simtec Electronics
+ *
+ * Based on PXA/SA1100 sleep code by:
+ *     Nicolas Pitre, (c) 2002 Monta Vista Software Inc
+ *     Cliff Brake, (c) 2001
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or

arch/arm/mach-s5pv210/sleep.S line 26

Quoted 10 lines
arch/arm/mach-s5pv210/sleep.S new file +10 -0
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-

1307 USA

Quoted 95 lines
arch/arm/mach-s5pv210/sleep.S new file +95 -0
+*/
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/memory.h>
+
+       .text
+
+       /* s3c_cpu_save
+        *
+        * entry:
+        *      r0 = save address (virtual addr of s3c_sleep_save_phys)
+       */
+
+ENTRY(s3c_cpu_save)
+
+       stmfd   sp!, { r3 - r12, lr }
+
+       mrc     p15, 0, r4, c13, c0, 0  @ FCSE/PID
+       mrc     p15, 0, r5, c3, c0, 0   @ Domain ID
+       mrc     p15, 0, r6, c2, c0, 0   @ Translation Table BASE0
+       mrc     p15, 0, r7, c2, c0, 1   @ Translation Table BASE1
+       mrc     p15, 0, r8, c2, c0, 2   @ Translation Table Control
+       mrc     p15, 0, r9, c1, c0, 0   @ Control register
+       mrc     p15, 0, r10, c1, c0, 1  @ Auxiliary control register
+       mrc     p15, 0, r11, c1, c0, 2  @ Co-processor access controls
+       mrc     p15, 0, r12, c10, c2, 0 @ Read PRRR
+       mrc     p15, 0, r3, c10, c2, 1  @ READ NMRR
+
+       stmia   r0, { r3 - r13 }
+
+       bl      s3c_pm_cb_flushcache
+
+       ldr     r0, =pm_cpu_sleep
+       ldr     r0, [ r0 ]
+       mov     pc, r0
+
+resume_with_mmu:
+       /*
+        * After MMU is turned on, restore the previous MMU table.
+        */
+       ldr     r9 , =(PAGE_OFFSET - PHYS_OFFSET)
+       add     r4, r4, r9
+       str     r12, [r4]
+
+       ldmfd   sp!, { r3 - r12, pc }
+
+       .ltorg
+
+       .data
+
+       .global s3c_sleep_save_phys
+s3c_sleep_save_phys:
+       .word   0
+
+       /* sleep magic, to allow the bootloader to check for an valid
+        * image to resume to. Must be the first word before the
+        * s3c_cpu_resume entry.
+       */
+
+       .word   0x2bedf00d
+
+       /* s3c_cpu_resume
+        *
+        * resume code entry for bootloader to call
+        *
+        * we must put this code here in the data segment as we have no
+        * other way of restoring the stack pointer after sleep, and we
+        * must not write to the code segment (code is read-only)
+       */
+
+ENTRY(s3c_cpu_resume)
+       mov     r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
+       msr     cpsr_c, r0
+
+       mov     r1, #0
+       mcr     p15, 0, r1, c8, c7, 0           @ invalidate TLBs
+       mcr     p15, 0, r1, c7, c5, 0           @ invalidate I Cache
+
+       ldr     r0, s3c_sleep_save_phys         @ address of restore block
+       ldmia   r0, { r3 - r13 }
+
+       mcr     p15, 0, r4, c13, c0, 0          @ FCSE/PID
+       mcr     p15, 0, r5, c3, c0, 0           @ Domain ID
+
+       mcr     p15, 0, r8, c2, c0, 2           @ Translation Table Control
+       mcr     p15, 0, r7, c2, c0, 1           @ Translation Table BASE1
+       mcr     p15, 0, r6, c2, c0, 0           @ Translation Table BASE0
+
+       mcr     p15, 0, r10, c1, c0, 1          @ Auxiliary control register
+
+       mov     r0, #0
+       mcr     p15, 0, r0, c8, c7, 0           @ Invalidate I & D TLB
+
+       mov     r0, #0                          @ restore copro access

arch/arm/mach-s5pv210/sleep.S

Quoted 10 lines
arch/arm/mach-s5pv210/sleep.S new file +10 -0
+       mcr     p15, 0, r11, c1, c0, 2          @ Co-processor access
+       mcr     p15, 0, r0, c7, c5, 4
+
+       mcr     p15, 0, r12, c10, c2, 0         @ write PRRR
+       mcr     p15, 0, r3, c10, c2, 1          @ write NMRR
+
+       /*
+        * In Cortex-A8, when MMU is turned on, the pipeline is flushed.
+        * And there are no valid entries in the MMU table at this point.
+        * So before turning on the MMU, the MMU entry for the DRAM

address

Quoted 12 lines

arch/arm/mach-s5pv210/sleep.S line 142

Quoted 11 lines
arch/arm/mach-s5pv210/sleep.S new file +11 -0
+        * range is added. After the MMU is turned on, the other entries
+        * in the MMU table will be restored.
+       */
+
+       /* r6 = Translation Table BASE0 */
+       mov     r4, r6
+       mov     r4, r4, LSR #14
+       mov     r4, r4, LSL #14
+
+       /* Load address for adding to MMU table list */
+       ldr     r11, =0xE010F000

what's the address 0xE010F000?

Physical address of INFORM0 register.

Quoted 32 lines
Quoted 32 lines
arch/arm/mach-s5pv210/sleep.S new file +29 -0
+       ldr     r10, [r11, #0]
+       mov     r10, r10, LSR #18
+       bic     r10, r10, #0x3
+       orr     r4, r4, r10
+
+       /* Calculate MMU table entry */
+       mov     r10, r10, LSL #18
+       ldr     r5, =0x40E
+       orr     r10, r10, r5
+
+       /* Back up originally data */
+       ldr     r12, [r4]
+
+       /* Add calculated MMU table entry into MMU table list */
+       str     r10, [r4]
+
+       ldr     r2, =resume_with_mmu
+       mcr     p15, 0, r9, c1, c0, 0           @ turn on MMU, etc
+
+       nop
+       nop
+       nop
+       nop
+       nop                                     @ second-to-last before mmu
+
+       mov     pc, r2                          @ go back to virtual address
+
+       .ltorg
+
arch/arm/plat-s5p/Makefile +0 -1
index f3e917e..4b838f6 100644
--- a/arch/arm/plat-s5p/Makefile
Quoted 8 lines

arch/arm/plat-s5p/Makefile obj-y += cpu.o · line 22

Quoted 7 lines

+++ b/arch/arm/plat-s5p/Makefile

arch/arm/plat-s5p/Makefile +2 -0
@@ -18,6 +18,8 @@ obj-y                         += cpu.o
 obj-y                          += clock.o
 obj-y                          += irq.o
 obj-$(CONFIG_S5P_EXT_INT)      += irq-eint.o
+obj-$(CONFIG_PM)               += pm.o
+obj-$(CONFIG_PM)               += irq-pm.o

Please make one line.

I think that it isn't matter.

Quoted 194 lines

arch/arm/plat-

Quoted 4 lines
arch/arm/plat-s5p/Makefile +0 -0
 # devices
 
arch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0 -0

s5p/include/plat/irqs.h

arch/arm/plat-s5p/include/plat/irqs.h line 97

Quoted 8 lines

index 3fb3a3a..2f8128a 100644

arch/arm/plat-s5p/include/plat/irqs.h +1 -0
@@ -94,4 +94,5 @@
                                               ((irq) - S5P_EINT_BASE1) : \
                                               ((irq) + 16 - S5P_EINT_BASE2))
 
+#define IRQ_EINT_BIT(x)                EINT_OFFSET(x)

where use it?

Quoted 124 lines
arch/arm/plat-s5p/include/plat/irqs.h +0 -0
 #endif /* __ASM_PLAT_S5P_IRQS_H */
arch/arm/plat-s5p/irq-pm.c new file +93 -0
new file mode 100644
index 0000000..dc33b9e
@@ -0,0 +1,93 @@
+/* linux/arch/arm/plat-s5p/irq-pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * Based on arch/arm/plat-s3c24xx/irq-pm.c,
+ * Copyright (c) 2003,2004 Simtec Electronics
+ *     Ben Dooks <[email protected]>
+ *     http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/sysdev.h>
+
+#include <plat/cpu.h>
+#include <plat/irqs.h>
+#include <plat/pm.h>
+#include <mach/map.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/regs-irq.h>
+
+/* state for IRQs over sleep */
+
+/* default is to allow for EINT0..EINT31, and IRQ_RTC_TIC, IRQ_RTC_ALARM,
+ * as wakeup sources
+ *
+ * set bit to 1 in allow bitfield to enable the wakeup settings on it
+*/
+
+unsigned long s3c_irqwake_intallow     = 0x00000006L;
+unsigned long s3c_irqwake_eintallow    = 0xffffffffL;
+
+int s3c_irq_wake(unsigned int irqno, unsigned int state)
+{
+       unsigned long irqbit;
+
+       switch (irqno) {
+       case IRQ_RTC_TIC:
+       case IRQ_RTC_ALARM:
+               irqbit = 1 << (irqno + 1 - IRQ_RTC_ALARM);
+               if (!state)
+                       s3c_irqwake_intmask |= irqbit;
+               else
+                       s3c_irqwake_intmask &= ~irqbit;
+               break;
+       default:
+               return -ENOENT;
+       }
+       return 0;
+}
+
+static struct sleep_save eint_save[] = {
+       SAVE_ITEM(S5P_EINT_CON(0)),
+       SAVE_ITEM(S5P_EINT_CON(1)),
+       SAVE_ITEM(S5P_EINT_CON(2)),
+       SAVE_ITEM(S5P_EINT_CON(3)),
+
+       SAVE_ITEM(S5P_EINT_FLTCON(0)),
+       SAVE_ITEM(S5P_EINT_FLTCON(1)),
+       SAVE_ITEM(S5P_EINT_FLTCON(2)),
+       SAVE_ITEM(S5P_EINT_FLTCON(3)),
+       SAVE_ITEM(S5P_EINT_FLTCON(4)),
+       SAVE_ITEM(S5P_EINT_FLTCON(5)),
+       SAVE_ITEM(S5P_EINT_FLTCON(6)),
+       SAVE_ITEM(S5P_EINT_FLTCON(7)),
+
+       SAVE_ITEM(S5P_EINT_MASK(0)),
+       SAVE_ITEM(S5P_EINT_MASK(1)),
+       SAVE_ITEM(S5P_EINT_MASK(2)),
+       SAVE_ITEM(S5P_EINT_MASK(3)),
+};
+
+int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+{
+       s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
+
+       return 0;
+}
+
+int s3c24xx_irq_resume(struct sys_device *dev)
+{
+       s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
+
+       return 0;
+}
+
arch/arm/plat-s5p/pm.c new file +18 -0
new file mode 100644
index 0000000..d592b63
@@ -0,0 +1,52 @@
+/* linux/arch/arm/plat-s5p/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * S5P Power Manager (Suspend-To-RAM) support
+ *
+ * Based on arch/arm/plat-s3c24xx/pm.c
+ * Copyright (c) 2004,2006 Simtec Electronics
+ *     Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/suspend.h>
+#include <plat/pm.h>

arch/arm/plat-s5p/pm.c line 28

Quoted 10 lines
arch/arm/plat-s5p/pm.c new file +10 -0
+
+#define PFX "s5p pm: "
+
+/* s3c_pm_check_resume_pin
+ *
+ * check to see if the pin is configured correctly for sleep mode, and
+ * make any necessary adjustments if it is not
+*/
+
+static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int

irqoffs)

arch/arm/plat-samsung/pm-

Quoted 25 lines
arch/arm/plat-s5p/pm.c new file +24 -0
+{
+       /* nothing here yet */
+}
+
+/* s3c_pm_configure_extint
+ *
+ * configure all external interrupt pins
+*/
+
+void s3c_pm_configure_extint(void)
+{
+       /* nothing here yet */
+}
+
+void s3c_pm_restore_core(void)
+{
+       /* nothing here yet */
+}
+
+void s3c_pm_save_core(void)
+{
+       /* nothing here yet */
+}
+
arch/arm/plat-samsung/pm- renamed from arch/arm/plat-samsung/pm-gpio.c +0 -0

gpio.c

Quoted 19 lines

index 7df03f8..9652820 100644

arch/arm/plat-samsung/pm-gpio.c +2 -2
@@ -192,7 +192,7 @@ struct s3c_gpio_pm s3c_gpio_pm_2bit = {
       .resume = s3c_gpio_pm_2bit_resume,
 };
 
-#ifdef CONFIG_ARCH_S3C64XX
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
 {
       chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -302,7 +302,7 @@ struct s3c_gpio_pm s3c_gpio_pm_4bit = {
       .save   = s3c_gpio_pm_4bit_save,
       .resume = s3c_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
Quoted 11 lines
Quoted 7 lines
arch/arm/plat-samsung/pm-gpio.c +0 -1
 /**
 * s3c_pm_save_gpio() - save gpio chip data for suspend
--

1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-

soc" in

Quoted 3 lines

the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Thanks and regards,

S.B. Kim

#3 lore raw

PATCH v3 1/1 ARM: S5PV210: Add Power Management Support

2010/9/17 Sangbeom Kim <[email protected]>:

Quoted 543 lines
Quoted 174 lines · Kyungmin Park
Quoted 22 lines · Sangbeom Kim

From: Jongpill Lee <[email protected]>

This patch adds suspend-to-ram support for S5PV210. Note. This patch is confirmed on SMDKV210 and SMDKC110 board.

---
Changes since v2:
1. Fixed comments as per commnets from Ben Dooks
2. Removed backup and restore function for VIC 2 and 3

Changes since v1:
1. Fixed comments as per comments from Ben Dooks
2. Removed redunt #if defined(CONFIG_PM)
3. Removed redunt including header files
4. Removed <mach/pm.h> and <plat/pm-s5p.h>
5. Moved 's5pv210_core_save' into machine directory
6. Moved sleep.S into machine directory for S5P SoCs compatibility
7. Added CF retension configuration when wake-up

Quoted 7 lines
?arch/arm/mach-s5pv210/Kconfig ? ? ? ? ? ? ? ? ? | ? ?6 +
?arch/arm/mach-s5pv210/Makefile ? ? ? ? ? ? ? ? ?| ? ?1 +
?arch/arm/mach-s5pv210/include/mach/pm-core.h ? ?| ? 43 ++++++
?arch/arm/mach-s5pv210/include/mach/regs-clock.h | ? ?7 +-
?arch/arm/mach-s5pv210/mach-smdkc110.c ? ? ? ? ? | ? ?3 +
?arch/arm/mach-s5pv210/mach-smdkv210.c ? ? ? ? ? | ? ?3 +
?arch/arm/mach-s5pv210/pm.c ? ? ? ? ? ? ? ? ? ? ?| ?166

++++++++++++++++++++++

Quoted 1 line

?arch/arm/mach-s5pv210/sleep.S ? ? ? ? ? ? ? ? ? | ?171

+++++++++++++++++++++++

arch/arm/mach-

Quoted 13 lines
?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +
?arch/arm/plat-s5p/include/plat/irqs.h ? ? ? ? ? | ? ?1 +
?arch/arm/plat-s5p/irq-pm.c ? ? ? ? ? ? ? ? ? ? ?| ? 93 ++++++++++++
?arch/arm/plat-s5p/pm.c ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 52 +++++++
?arch/arm/plat-samsung/pm-gpio.c ? ? ? ? ? ? ? ? | ? ?4 +-

?13 files changed, 548 insertions(+), 4 deletions(-) ?create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h ?create mode 100644 arch/arm/mach-s5pv210/pm.c
?create mode 100644 arch/arm/mach-s5pv210/sleep.S ?create mode 100644 arch/arm/plat-s5p/irq-pm.c
?create mode 100644 arch/arm/plat-s5p/pm.c

arch/arm/mach- renamed from arch/arm/mach-s5pv210/Kconfig +0 -0

s5pv210/Kconfig

arch/arm/mach-

Quoted 22 lines

index b46925b..6649170 100644

arch/arm/mach-s5pv210/Kconfig +0 -0
@@ -14,6 +14,7 @@ config CPU_S5PV210

? ? ? ?select PLAT_S5P
? ? ? ?select S3C_PL330_DMA
? ? ? ?select S5P_EXT_INT
+ ? ? ? select S5PV210_PM if PM
? ? ? ?help
? ? ? ? ?Enable S5PV210 CPU support

arch/arm/mach-s5pv210/Kconfig +0 -0
@@ -138,4 +139,9 @@ config MACH_SMDKV210
 

?endmenu

arch/arm/mach-s5pv210/Kconfig +5 -0
+config S5PV210_PM
+ ? ? ? bool
+ ? ? ? help
+ ? ? ? ? Power Management code common to S5PV210
+

?endif

arch/arm/mach- renamed from arch/arm/mach-s5pv210/Makefile +0 -0

s5pv210/Makefile

Quoted 9 lines

index 7045489..c63c162 100644

arch/arm/mach-s5pv210/Makefile +0 -0
@@ -14,6 +14,7 @@ obj- ? ? ? ? ? ? ? ? ? ? ? ? ?:=
 

?obj-$(CONFIG_CPU_S5PV210) ? ? ?+= cpu.o init.o clock.o dma.o gpiolib.o ?obj-$(CONFIG_CPU_S5PV210) ? ? ?+= setup-i2c0.o +obj-$(CONFIG_S5PV210_PM) ? ? ? += pm.o sleep.o

Review

Quoted 3 lines

?# machine support

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/pm-core.h

Review

Quoted 49 lines

new file mode 100644
index 0000000..e8d394f

arch/arm/mach-s5pv210/include/mach/pm-core.h new file +43 -0
@@ -0,0 +1,43 @@
+/* linux/arch/arm/mach-s5pv210/include/mach/pm-core.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * Based on arch/arm/mach-s3c2410/include/mach/pm-core.h,
+ * Copyright 2008 Simtec Electronics
+ * ? ? ?Ben Dooks <[email protected]>
+ * ? ? ?http://armlinux.simtec.co.uk/
+ *
+ * S5PV210 - PM core support for arch/arm/plat-s5p/pm.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+static inline void s3c_pm_debug_init_uart(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_prepare_irqs(void)
+{
+ ? ? ? __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK);
+ ? ? ? __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK);
+}
+
+static inline void s3c_pm_arch_stop_clocks(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_show_resume_irqs(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+static inline void s3c_pm_arch_update_uart(void __iomem *regs,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct pm_uart_save *save)
+{
+ ? ? ? /* nothing here yet */
+}
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/regs-clock.h

arch/arm/mach-

Quoted 26 lines

index 499aef7..929fd3a 100644

arch/arm/mach-s5pv210/include/mach/regs-clock.h +0 -0
@@ -95,7 +95,7 @@

?/* Registers related to power management */ ?#define S5P_PWR_CFG ? ? ? ? ? ?S5P_CLKREG(0xC000) ?#define S5P_EINT_WAKEUP_MASK ? S5P_CLKREG(0xC004)

arch/arm/mach-s5pv210/include/mach/regs-clock.h +1 -1
-#define S5P_WAKEUP_MASK ? ? ? ?S5P_CLKREG(0xC008)
+#define S5P_WAKEUP_MASK ? ? ? ? ? ? ? ?S5P_CLKREG(0xC008)

?#define S5P_PWR_MODE ? ? ? ? ? S5P_CLKREG(0xC00C) ?#define S5P_NORMAL_CFG ? ? ? ? S5P_CLKREG(0xC010) ?#define S5P_IDLE_CFG ? ? ? ? ? S5P_CLKREG(0xC020)

arch/arm/mach-s5pv210/include/mach/regs-clock.h +0 -0
@@ -159,8 +159,11 @@
 ?#define S5P_SLEEP_CFG_USBOSC_EN ? ? ? ? ? ? ? ?(1 << 1)
 

?/* OTHERS Resgister */

arch/arm/mach-s5pv210/include/mach/regs-clock.h +4 -0
+#define S5P_OTHERS_RET_IO ? ? ? ? ? ? ?(1 << 31)
+#define S5P_OTHERS_RET_CF ? ? ? ? ? ? ?(1 << 30)
+#define S5P_OTHERS_RET_MMC ? ? ? ? ? ? (1 << 29)
+#define S5P_OTHERS_RET_UART ? ? ? ? ? ?(1 << 28)

?#define S5P_OTHERS_USB_SIG_MASK ? ? ? ? ? ? ? ?(1 << 16) -#define S5P_OTHERS_MIPI_DPHY_EN ? ? ? ? ? ? ? ?(1 << 28)

?/* MIPI */
?#define S5P_MIPI_DPHY_EN ? ? ? ? ? ? ? (3)

arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0

s5pv210/mach-smdkc110.c

Quoted 10 lines

index 8211bb8..053b50d 100644

arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0
@@ -28,6 +28,7 @@

?#include <plat/cpu.h>
?#include <plat/ata.h>
?#include <plat/iic.h>
+#include <plat/pm.h>

?/* Following are default values for UCON, ULCON and UFCON UART registers

*/

Quoted 3 lines

?#define SMDKC110_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\

arch/arm/mach-s5pv210/mach-smdkc110.c +0 -0
@@ -110,6 +111,8 @@ static void __init smdkc110_map_io(void)
 
Quoted 6 lines

arch/arm/mach-s5pv210/mach-smdkc110.c static void __init smdkc110_map_io(void) · line 114

Quoted 3 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
 ?static void __init smdkc110_machine_init(void)
 ?{
+ ? ? ? s3c_pm_init();

Umm How about to add the cpu common code. e.g., mach-s5pv210/cpu.c? If chip support the pm feature. why not use it for each board?

This issue has been discussed before.
I followed Ben's comment.
its operation depends on machine.

Quoted 341 lines

arch/arm/mach-

Quoted 5 lines
arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
+
 ? ? ? ?s3c_i2c0_set_platdata(NULL);
 ? ? ? ?s3c_i2c1_set_platdata(NULL);
 ? ? ? ?s3c_i2c2_set_platdata(NULL);
arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-smdkv210.c +0 -0

s5pv210/mach-smdkv210.c

Quoted 10 lines

index fbbc0a3..5a9c79c 100644

arch/arm/mach-s5pv210/mach-smdkv210.c +0 -0
@@ -31,6 +31,7 @@

?#include <plat/ata.h>
?#include <plat/iic.h>
?#include <plat/keypad.h>
+#include <plat/pm.h>

?/* Following are default values for UCON, ULCON and UFCON UART registers

*/

Quoted 158 lines

?#define SMDKV210_UCON_DEFAULT ?(S3C2410_UCON_TXILEVEL | ? ? ? ?\

arch/arm/mach-s5pv210/mach-smdkv210.c +2 -0
@@ -145,6 +146,8 @@ static void __init smdkv210_map_io(void)
 
 ?static void __init smdkv210_machine_init(void)
 ?{
+ ? ? ? s3c_pm_init();
+
 ? ? ? ?samsung_keypad_set_platdata(&smdkv210_keypad_data);
 ? ? ? ?s3c24xx_ts_set_platdata(&s3c_ts_platform);
 
arch/arm/mach-s5pv210/pm.c new file +142 -0
new file mode 100644
index 0000000..549d792
@@ -0,0 +1,166 @@
+/* linux/arch/arm/mach-s5pv210/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5PV210 - Power Management support
+ *
+ * Based on arch/arm/mach-s3c2410/pm.c
+ * Copyright (c) 2006 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/io.h>
+
+#include <plat/cpu.h>
+#include <plat/pm.h>
+#include <plat/regs-timer.h>
+
+#include <mach/regs-irq.h>
+#include <mach/regs-clock.h>
+
+static struct sleep_save s5pv210_core_save[] = {
+ ? ? ? /* Clock source */
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC0),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC1),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC2),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC3),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC4),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC5),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC6),
+
+ ? ? ? /* Clock source Mask */
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC_MASK0),
+ ? ? ? SAVE_ITEM(S5P_CLK_SRC_MASK1),
+
+ ? ? ? /* Clock Divider */
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV0),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV1),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV2),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV3),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV4),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV5),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV6),
+ ? ? ? SAVE_ITEM(S5P_CLK_DIV7),
+
+ ? ? ? /* Clock Main Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN1),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_MAIN2),
+
+ ? ? ? /* Clock source Peri Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_PERI0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_PERI1),
+
+ ? ? ? /* Clock source SCLK Gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_SCLK0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_SCLK1),
+
+ ? ? ? /* Clock IP Clock gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP0),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP1),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP2),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP3),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_IP4),
+
+ ? ? ? /* Clock Blcok and Bus gate */
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_BLOCK),
+ ? ? ? SAVE_ITEM(S5P_CLKGATE_BUS0),
+
+ ? ? ? /* Clock ETC */
+ ? ? ? SAVE_ITEM(S5P_CLK_OUT),
+ ? ? ? SAVE_ITEM(S5P_MDNIE_SEL),
+
+ ? ? ? /* PWM Register */
+ ? ? ? SAVE_ITEM(S3C2410_TCFG0),
+ ? ? ? SAVE_ITEM(S3C2410_TCFG1),
+ ? ? ? SAVE_ITEM(S3C64XX_TINT_CSTAT),
+ ? ? ? SAVE_ITEM(S3C2410_TCON),
+ ? ? ? SAVE_ITEM(S3C2410_TCNTB(0)),
+ ? ? ? SAVE_ITEM(S3C2410_TCMPB(0)),
+ ? ? ? SAVE_ITEM(S3C2410_TCNTO(0)),
+};
+
+void s5pv210_cpu_suspend(void)
+{
+ ? ? ? unsigned long tmp;
+
+ ? ? ? /* issue the standby signal into the pm unit. Note, we
+ ? ? ? ?* issue a write-buffer drain just in case */
+
+ ? ? ? tmp = 0;
+
+ ? ? ? asm("b 1f\n\t"
+ ? ? ? ? ? ".align 5\n\t"
+ ? ? ? ? ? "1:\n\t"
+ ? ? ? ? ? "mcr p15, 0, %0, c7, c10, 5\n\t"
+ ? ? ? ? ? "mcr p15, 0, %0, c7, c10, 4\n\t"
+ ? ? ? ? ? "wfi" : : "r" (tmp));
+
+ ? ? ? /* we should never get past here */
+ ? ? ? panic("sleep resumed to originator?");
+}
+
+static void s5pv210_pm_prepare(void)
+{
+ ? ? ? unsigned int tmp;
+
+ ? ? ? /* ensure at least INFORM0 has the resume address */
+ ? ? ? __raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
+
+ ? ? ? tmp = __raw_readl(S5P_SLEEP_CFG);
+ ? ? ? tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
+ ? ? ? __raw_writel(tmp, S5P_SLEEP_CFG);
+
+ ? ? ? /* WFI for SLEEP mode configuration by SYSCON */
+ ? ? ? tmp = __raw_readl(S5P_PWR_CFG);
+ ? ? ? tmp &= S5P_CFG_WFI_CLEAN;
+ ? ? ? tmp |= S5P_CFG_WFI_SLEEP;
+ ? ? ? __raw_writel(tmp, S5P_PWR_CFG);
+
+ ? ? ? /* SYSCON interrupt handling disable */
+ ? ? ? tmp = __raw_readl(S5P_OTHERS);
+ ? ? ? tmp |= S5P_OTHER_SYSC_INTOFF;
+ ? ? ? __raw_writel(tmp, S5P_OTHERS);
+
+ ? ? ? s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
+}
+
+static int s5pv210_pm_add(struct sys_device *sysdev)
+{
+ ? ? ? pm_cpu_prep = s5pv210_pm_prepare;
+ ? ? ? pm_cpu_sleep = s5pv210_cpu_suspend;
+
+ ? ? ? return 0;
+}
+

arch/arm/mach-s5pv210/pm.c line 152

Quoted 10 lines
arch/arm/mach-s5pv210/pm.c new file +10 -0
+static int s5pv210_pm_resume(struct sys_device *dev)
+{
+ ? ? ? u32 tmp;
+
+ ? ? ? tmp = __raw_readl(S5P_OTHERS);
+ ? ? ? tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\
+ ? ? ? ? ? ? ? S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);
+ ? ? ? __raw_writel(tmp , S5P_OTHERS);
+
+ ? ? ? s3c_pm_do_restore_core(s5pv210_core_save,

ARRAY_SIZE(s5pv210_core_save));

arch/arm/mach-s5pv210/pm.c

Quoted 12 lines
arch/arm/mach-s5pv210/pm.c new file +12 -0
+
+ ? ? ? return 0;
+}
+
+static struct sysdev_driver s5pv210_pm_driver = {
+ ? ? ? .add ? ? ? ? ? ?= s5pv210_pm_add,
+ ? ? ? .resume ? ? ? ? = s5pv210_pm_resume,
+};
+
+static __init int s5pv210_pm_drvinit(void)
+{
+ ? ? ? return sysdev_driver_register(&s5pv210_sysclass,

&s5pv210_pm_driver);

arch/arm/mach-

Quoted 3 lines
arch/arm/mach-s5pv210/pm.c new file +2 -0
+}
+arch_initcall(s5pv210_pm_drvinit);
arch/arm/mach- renamed from arch/arm/mach-s5pv210/sleep.S +0 -0

s5pv210/sleep.S

Quoted 21 lines

new file mode 100644
index 0000000..4124fd4

arch/arm/mach-s5pv210/sleep.S new file +16 -0
@@ -0,0 +1,171 @@
+/* linux/arch/arm/plat-s5p/sleep.S
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5PV210 power Manager (Suspend-To-RAM) support
+ * Based on S3C2410 sleep code by:
+ * ? ? Ben Dooks, (c) 2004 Simtec Electronics
+ *
+ * Based on PXA/SA1100 sleep code by:
+ * ? ? Nicolas Pitre, (c) 2002 Monta Vista Software Inc
+ * ? ? Cliff Brake, (c) 2001
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or

arch/arm/mach-s5pv210/sleep.S line 26

Quoted 10 lines
arch/arm/mach-s5pv210/sleep.S new file +10 -0
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ?02111-

1307 ?USA

Quoted 95 lines
arch/arm/mach-s5pv210/sleep.S new file +95 -0
+*/
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/memory.h>
+
+ ? ? ? .text
+
+ ? ? ? /* s3c_cpu_save
+ ? ? ? ?*
+ ? ? ? ?* entry:
+ ? ? ? ?* ? ? ?r0 = save address (virtual addr of s3c_sleep_save_phys)
+ ? ? ? */
+
+ENTRY(s3c_cpu_save)
+
+ ? ? ? stmfd ? sp!, { r3 - r12, lr }
+
+ ? ? ? mrc ? ? p15, 0, r4, c13, c0, 0 ?@ FCSE/PID
+ ? ? ? mrc ? ? p15, 0, r5, c3, c0, 0 ? @ Domain ID
+ ? ? ? mrc ? ? p15, 0, r6, c2, c0, 0 ? @ Translation Table BASE0
+ ? ? ? mrc ? ? p15, 0, r7, c2, c0, 1 ? @ Translation Table BASE1
+ ? ? ? mrc ? ? p15, 0, r8, c2, c0, 2 ? @ Translation Table Control
+ ? ? ? mrc ? ? p15, 0, r9, c1, c0, 0 ? @ Control register
+ ? ? ? mrc ? ? p15, 0, r10, c1, c0, 1 ?@ Auxiliary control register
+ ? ? ? mrc ? ? p15, 0, r11, c1, c0, 2 ?@ Co-processor access controls
+ ? ? ? mrc ? ? p15, 0, r12, c10, c2, 0 @ Read PRRR
+ ? ? ? mrc ? ? p15, 0, r3, c10, c2, 1 ?@ READ NMRR
+
+ ? ? ? stmia ? r0, { r3 - r13 }
+
+ ? ? ? bl ? ? ?s3c_pm_cb_flushcache
+
+ ? ? ? ldr ? ? r0, =pm_cpu_sleep
+ ? ? ? ldr ? ? r0, [ r0 ]
+ ? ? ? mov ? ? pc, r0
+
+resume_with_mmu:
+ ? ? ? /*
+ ? ? ? ?* After MMU is turned on, restore the previous MMU table.
+ ? ? ? ?*/
+ ? ? ? ldr ? ? r9 , =(PAGE_OFFSET - PHYS_OFFSET)
+ ? ? ? add ? ? r4, r4, r9
+ ? ? ? str ? ? r12, [r4]
+
+ ? ? ? ldmfd ? sp!, { r3 - r12, pc }
+
+ ? ? ? .ltorg
+
+ ? ? ? .data
+
+ ? ? ? .global s3c_sleep_save_phys
+s3c_sleep_save_phys:
+ ? ? ? .word ? 0
+
+ ? ? ? /* sleep magic, to allow the bootloader to check for an valid
+ ? ? ? ?* image to resume to. Must be the first word before the
+ ? ? ? ?* s3c_cpu_resume entry.
+ ? ? ? */
+
+ ? ? ? .word ? 0x2bedf00d
+
+ ? ? ? /* s3c_cpu_resume
+ ? ? ? ?*
+ ? ? ? ?* resume code entry for bootloader to call
+ ? ? ? ?*
+ ? ? ? ?* we must put this code here in the data segment as we have no
+ ? ? ? ?* other way of restoring the stack pointer after sleep, and we
+ ? ? ? ?* must not write to the code segment (code is read-only)
+ ? ? ? */
+
+ENTRY(s3c_cpu_resume)
+ ? ? ? mov ? ? r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
+ ? ? ? msr ? ? cpsr_c, r0
+
+ ? ? ? mov ? ? r1, #0
+ ? ? ? mcr ? ? p15, 0, r1, c8, c7, 0 ? ? ? ? ? @ invalidate TLBs
+ ? ? ? mcr ? ? p15, 0, r1, c7, c5, 0 ? ? ? ? ? @ invalidate I Cache
+
+ ? ? ? ldr ? ? r0, s3c_sleep_save_phys ? ? ? ? @ address of restore block
+ ? ? ? ldmia ? r0, { r3 - r13 }
+
+ ? ? ? mcr ? ? p15, 0, r4, c13, c0, 0 ? ? ? ? ?@ FCSE/PID
+ ? ? ? mcr ? ? p15, 0, r5, c3, c0, 0 ? ? ? ? ? @ Domain ID
+
+ ? ? ? mcr ? ? p15, 0, r8, c2, c0, 2 ? ? ? ? ? @ Translation Table Control
+ ? ? ? mcr ? ? p15, 0, r7, c2, c0, 1 ? ? ? ? ? @ Translation Table BASE1
+ ? ? ? mcr ? ? p15, 0, r6, c2, c0, 0 ? ? ? ? ? @ Translation Table BASE0
+
+ ? ? ? mcr ? ? p15, 0, r10, c1, c0, 1 ? ? ? ? ?@ Auxiliary control register
+
+ ? ? ? mov ? ? r0, #0
+ ? ? ? mcr ? ? p15, 0, r0, c8, c7, 0 ? ? ? ? ? @ Invalidate I & D TLB
+
+ ? ? ? mov ? ? r0, #0 ? ? ? ? ? ? ? ? ? ? ? ? ?@ restore copro access

arch/arm/mach-s5pv210/sleep.S line 131

Quoted 10 lines
arch/arm/mach-s5pv210/sleep.S new file +10 -0
+ ? ? ? mcr ? ? p15, 0, r11, c1, c0, 2 ? ? ? ? ?@ Co-processor access
+ ? ? ? mcr ? ? p15, 0, r0, c7, c5, 4
+
+ ? ? ? mcr ? ? p15, 0, r12, c10, c2, 0 ? ? ? ? @ write PRRR
+ ? ? ? mcr ? ? p15, 0, r3, c10, c2, 1 ? ? ? ? ?@ write NMRR
+
+ ? ? ? /*
+ ? ? ? ?* In Cortex-A8, when MMU is turned on, the pipeline is flushed.
+ ? ? ? ?* And there are no valid entries in the MMU table at this point.
+ ? ? ? ?* So before turning on the MMU, the MMU entry for the DRAM

address

Quoted 12 lines

arch/arm/mach-s5pv210/sleep.S line 142

Quoted 11 lines
arch/arm/mach-s5pv210/sleep.S new file +11 -0
+ ? ? ? ?* range is added. After the MMU is turned on, the other entries
+ ? ? ? ?* in the MMU table will be restored.
+ ? ? ? */
+
+ ? ? ? /* r6 = Translation Table BASE0 */
+ ? ? ? mov ? ? r4, r6
+ ? ? ? mov ? ? r4, r4, LSR #14
+ ? ? ? mov ? ? r4, r4, LSL #14
+
+ ? ? ? /* Load address for adding to MMU table list */
+ ? ? ? ldr ? ? r11, =0xE010F000

what's the address 0xE010F000?

Quoted 1 line

Physical address of INFORM0 register.

Then should be use the macro?

Quoted 253 lines
Quoted 33 lines
Quoted 33 lines
arch/arm/mach-s5pv210/sleep.S new file +29 -0
+ ? ? ? ldr ? ? r10, [r11, #0]
+ ? ? ? mov ? ? r10, r10, LSR #18
+ ? ? ? bic ? ? r10, r10, #0x3
+ ? ? ? orr ? ? r4, r4, r10
+
+ ? ? ? /* Calculate MMU table entry */
+ ? ? ? mov ? ? r10, r10, LSL #18
+ ? ? ? ldr ? ? r5, =0x40E
+ ? ? ? orr ? ? r10, r10, r5
+
+ ? ? ? /* Back up originally data */
+ ? ? ? ldr ? ? r12, [r4]
+
+ ? ? ? /* Add calculated MMU table entry into MMU table list */
+ ? ? ? str ? ? r10, [r4]
+
+ ? ? ? ldr ? ? r2, =resume_with_mmu
+ ? ? ? mcr ? ? p15, 0, r9, c1, c0, 0 ? ? ? ? ? @ turn on MMU, etc
+
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop
+ ? ? ? nop ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? @ second-to-last before mmu
+
+ ? ? ? mov ? ? pc, r2 ? ? ? ? ? ? ? ? ? ? ? ? ?@ go back to virtual address
+
+ ? ? ? .ltorg
+
arch/arm/plat-s5p/Makefile +0 -1
index f3e917e..4b838f6 100644
--- a/arch/arm/plat-s5p/Makefile
Quoted 8 lines

arch/arm/plat-s5p/Makefile

Quoted 7 lines

+++ b/arch/arm/plat-s5p/Makefile

arch/arm/plat-s5p/Makefile +0 -0
@@ -18,6 +18,8 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? += cpu.o

?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= clock.o
?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
?obj-$(CONFIG_S5P_EXT_INT) ? ? ?+= irq-eint.o

arch/arm/plat-s5p/Makefile +2 -0
+obj-$(CONFIG_PM) ? ? ? ? ? ? ? += pm.o
+obj-$(CONFIG_PM) ? ? ? ? ? ? ? += irq-pm.o

Please make one line.

I think that it isn't matter.

Quoted 194 lines

arch/arm/plat-

Quoted 4 lines

?# devices

arch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0 -0

s5p/include/plat/irqs.h

arch/arm/plat-s5p/include/plat/irqs.h line 97

Quoted 8 lines

index 3fb3a3a..2f8128a 100644

arch/arm/plat-s5p/include/plat/irqs.h +1 -0
@@ -94,4 +94,5 @@
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?((irq) - S5P_EINT_BASE1) : \
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?((irq) + 16 - S5P_EINT_BASE2))
 
+#define IRQ_EINT_BIT(x) ? ? ? ? ? ? ? ?EINT_OFFSET(x)

where use it?

Quoted 124 lines

?#endif /* __ASM_PLAT_S5P_IRQS_H */

arch/arm/plat-s5p/irq-pm.c new file +93 -0
new file mode 100644
index 0000000..dc33b9e
@@ -0,0 +1,93 @@
+/* linux/arch/arm/plat-s5p/irq-pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * Based on arch/arm/plat-s3c24xx/irq-pm.c,
+ * Copyright (c) 2003,2004 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ * ? ? http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/sysdev.h>
+
+#include <plat/cpu.h>
+#include <plat/irqs.h>
+#include <plat/pm.h>
+#include <mach/map.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/regs-irq.h>
+
+/* state for IRQs over sleep */
+
+/* default is to allow for EINT0..EINT31, and IRQ_RTC_TIC, IRQ_RTC_ALARM,
+ * as wakeup sources
+ *
+ * set bit to 1 in allow bitfield to enable the wakeup settings on it
+*/
+
+unsigned long s3c_irqwake_intallow ? ? = 0x00000006L;
+unsigned long s3c_irqwake_eintallow ? ?= 0xffffffffL;
+
+int s3c_irq_wake(unsigned int irqno, unsigned int state)
+{
+ ? ? ? unsigned long irqbit;
+
+ ? ? ? switch (irqno) {
+ ? ? ? case IRQ_RTC_TIC:
+ ? ? ? case IRQ_RTC_ALARM:
+ ? ? ? ? ? ? ? irqbit = 1 << (irqno + 1 - IRQ_RTC_ALARM);
+ ? ? ? ? ? ? ? if (!state)
+ ? ? ? ? ? ? ? ? ? ? ? s3c_irqwake_intmask |= irqbit;
+ ? ? ? ? ? ? ? else
+ ? ? ? ? ? ? ? ? ? ? ? s3c_irqwake_intmask &= ~irqbit;
+ ? ? ? ? ? ? ? break;
+ ? ? ? default:
+ ? ? ? ? ? ? ? return -ENOENT;
+ ? ? ? }
+ ? ? ? return 0;
+}
+
+static struct sleep_save eint_save[] = {
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_CON(3)),
+
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(3)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(4)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(5)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(6)),
+ ? ? ? SAVE_ITEM(S5P_EINT_FLTCON(7)),
+
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(0)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(1)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(2)),
+ ? ? ? SAVE_ITEM(S5P_EINT_MASK(3)),
+};
+
+int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+{
+ ? ? ? s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
+
+ ? ? ? return 0;
+}
+
+int s3c24xx_irq_resume(struct sys_device *dev)
+{
+ ? ? ? s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
+
+ ? ? ? return 0;
+}
+
arch/arm/plat-s5p/pm.c new file +18 -0
new file mode 100644
index 0000000..d592b63
@@ -0,0 +1,52 @@
+/* linux/arch/arm/plat-s5p/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * ? ? ? ? ? ? http://www.samsung.com
+ *
+ * S5P Power Manager (Suspend-To-RAM) support
+ *
+ * Based on arch/arm/plat-s3c24xx/pm.c
+ * Copyright (c) 2004,2006 Simtec Electronics
+ * ? ? Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/suspend.h>
+#include <plat/pm.h>

arch/arm/plat-s5p/pm.c line 28

Quoted 10 lines
arch/arm/plat-s5p/pm.c new file +10 -0
+
+#define PFX "s5p pm: "
+
+/* s3c_pm_check_resume_pin
+ *
+ * check to see if the pin is configured correctly for sleep mode, and
+ * make any necessary adjustments if it is not
+*/
+
+static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int

irqoffs)

arch/arm/plat-samsung/pm-

Quoted 25 lines
arch/arm/plat-s5p/pm.c new file +24 -0
+{
+ ? ? ? /* nothing here yet */
+}
+
+/* s3c_pm_configure_extint
+ *
+ * configure all external interrupt pins
+*/
+
+void s3c_pm_configure_extint(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+void s3c_pm_restore_core(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
+void s3c_pm_save_core(void)
+{
+ ? ? ? /* nothing here yet */
+}
+
arch/arm/plat-samsung/pm- renamed from arch/arm/plat-samsung/pm-gpio.c +0 -0

gpio.c

Quoted 19 lines

index 7df03f8..9652820 100644

arch/arm/plat-samsung/pm-gpio.c +2 -2
@@ -192,7 +192,7 @@ struct s3c_gpio_pm s3c_gpio_pm_2bit = {
 ? ? ? ?.resume = s3c_gpio_pm_2bit_resume,
 ?};
 
-#ifdef CONFIG_ARCH_S3C64XX
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 ?static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
 ?{
 ? ? ? ?chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -302,7 +302,7 @@ struct s3c_gpio_pm s3c_gpio_pm_4bit = {
 ? ? ? ?.save ? = s3c_gpio_pm_4bit_save,
 ? ? ? ?.resume = s3c_gpio_pm_4bit_resume,
 ?};
-#endif /* CONFIG_ARCH_S3C64XX */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
Quoted 11 lines
Quoted 7 lines

?/**
?* s3c_pm_save_gpio() - save gpio chip data for suspend --
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-

soc" in

Quoted 3 lines

the body of a message to majordomo at vger.kernel.org More majordomo info at ?http://vger.kernel.org/majordomo-info.html

Thanks and regards,

S.B. Kim

#4 lore raw

PATCH v3 1/1 ARM: S5PV210: Add Power Management Support

In reply to Sangbeom Kim
Quoted 764 lines · On Wed, 15 Sep 2010 17:33:18 +0900 Sangbeom Kim <[email protected]> wrote:

From: Jongpill Lee <[email protected]>

This patch adds suspend-to-ram support for S5PV210. Note. This patch is confirmed on SMDKV210 and SMDKC110 board.

---
Changes since v2:
1. Fixed comments as per commnets from Ben Dooks
2. Removed backup and restore function for VIC 2 and 3

Changes since v1:
1. Fixed comments as per comments from Ben Dooks
2. Removed redunt #if defined(CONFIG_PM)
3. Removed redunt including header files
4. Removed <mach/pm.h> and <plat/pm-s5p.h>
5. Moved 's5pv210_core_save' into machine directory
6. Moved sleep.S into machine directory for S5P SoCs compatibility
7. Added CF retension configuration when wake-up

 arch/arm/mach-s5pv210/Kconfig                   |    6 +
 arch/arm/mach-s5pv210/Makefile                  |    1 +
 arch/arm/mach-s5pv210/include/mach/pm-core.h    |   43 ++++++
 arch/arm/mach-s5pv210/include/mach/regs-clock.h |    7 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c           |    3 +
 arch/arm/mach-s5pv210/mach-smdkv210.c           |    3 +
 arch/arm/mach-s5pv210/pm.c                      |  166
++++++++++++++++++++++
arch/arm/mach-s5pv210/sleep.S                   |  171
+++++++++++++++++++++++
arch/arm/plat-s5p/Makefile                      |    2 +
arch/arm/plat-s5p/include/plat/irqs.h           |    1 +
arch/arm/plat-s5p/irq-pm.c                      |   93 ++++++++++++
arch/arm/plat-s5p/pm.c                          |   52 +++++++
arch/arm/plat-samsung/pm-gpio.c                 |    4 +- 13 files

changed, 548 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h create mode 100644 arch/arm/mach-s5pv210/pm.c create mode 100644 arch/arm/mach-s5pv210/sleep.S create mode 100644 arch/arm/plat-s5p/irq-pm.c create mode 100644 arch/arm/plat-s5p/pm.c

(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Kconfig index b46925b..6649170 100644

arch/arm/mach-s5pv210/Kconfig +6 -0
@@ -14,6 +14,7 @@ config CPU_S5PV210
 	select PLAT_S5P
 	select S3C_PL330_DMA
 	select S5P_EXT_INT
+	select S5PV210_PM if PM
 	help
 	  Enable S5PV210 CPU support
 
@@ -138,4 +139,9 @@ config MACH_SMDKV210
 
 endmenu
 
+config S5PV210_PM
+	bool
+	help
+	  Power Management code common to S5PV210
+
 endif
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/Makefile index 7045489..c63c162 100644

arch/arm/mach-s5pv210/Makefile +0 -0
@@ -14,6 +14,7 @@ obj-				:=
 
 obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o

gpiolib.o obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o

arch/arm/mach-s5pv210/Makefile +1 -0
+obj-$(CONFIG_S5PV210_PM)	+= pm.o sleep.o
 
 # machine support
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/pm-core.h new file mode 100644 index 0000000..e8d394f

arch/arm/mach-s5pv210/include/mach/pm-core.h new file +13 -0
@@ -0,0 +1,43 @@
+/* linux/arch/arm/mach-s5pv210/include/mach/pm-core.h
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * Based on arch/arm/mach-s3c2410/include/mach/pm-core.h,
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <[email protected]>
+ *      http://armlinux.simtec.co.uk/
+ *
+ * S5PV210 - PM core support for arch/arm/plat-s5p/pm.c
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.

arch/arm/mach-s5pv210/include/mach/pm-core.h new file +28 -0
+*/
+
+static inline void s3c_pm_debug_init_uart(void)
+{
+	/* nothing here yet */
+}
+
+static inline void s3c_pm_arch_prepare_irqs(void)
+{
+	__raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK);
+	__raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK);
+}
+
+static inline void s3c_pm_arch_stop_clocks(void)
+{
+	/* nothing here yet */
+}
+
+static inline void s3c_pm_arch_show_resume_irqs(void)
+{
+	/* nothing here yet */
+}
+
+static inline void s3c_pm_arch_update_uart(void __iomem *regs,
+					   struct pm_uart_save *save)
+{
+	/* nothing here yet */
+}
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/include/mach/regs-clock.h index 499aef7..929fd3a 100644 --- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h +++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h @@ -95,7 +95,7 @@
/* Registers related to power management */
#define S5P_PWR_CFG S5P_CLKREG(0xC000)
#define S5P_EINT_WAKEUP_MASK S5P_CLKREG(0xC004)

arch/arm/mach-s5pv210/include/mach/regs-clock.h +5 -2
-#define S5P_WAKEUP_MASK 	S5P_CLKREG(0xC008)
+#define S5P_WAKEUP_MASK		S5P_CLKREG(0xC008)
 #define S5P_PWR_MODE		S5P_CLKREG(0xC00C)
 #define S5P_NORMAL_CFG		S5P_CLKREG(0xC010)
 #define S5P_IDLE_CFG		S5P_CLKREG(0xC020)
@@ -159,8 +159,11 @@
 #define S5P_SLEEP_CFG_USBOSC_EN		(1 << 1)
 
 /* OTHERS Resgister */
+#define S5P_OTHERS_RET_IO		(1 << 31)
+#define S5P_OTHERS_RET_CF		(1 << 30)
+#define S5P_OTHERS_RET_MMC		(1 << 29)
+#define S5P_OTHERS_RET_UART		(1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK		(1 << 16)
-#define S5P_OTHERS_MIPI_DPHY_EN		(1 << 28)
 
 /* MIPI */
 #define S5P_MIPI_DPHY_EN		(3)
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/mach-smdkc110.c index 8211bb8..053b50d 100644

arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0
@@ -28,6 +28,7 @@
 #include <plat/cpu.h>
 #include <plat/ata.h>
 #include <plat/iic.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART

registers */ #define SMDKC110_UCON_DEFAULT
(S3C2410_UCON_TXILEVEL | \ @@ -110,6 +111,8 @@ static void
__init smdkc110_map_io(void)
static void __init smdkc110_machine_init(void)
{

arch/arm/mach-s5pv210/mach-smdkc110.c +2 -0
+	s3c_pm_init();
+
 	s3c_i2c0_set_platdata(NULL);
 	s3c_i2c1_set_platdata(NULL);
 	s3c_i2c2_set_platdata(NULL);
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/mach-smdkv210.c index fbbc0a3..5a9c79c 100644

arch/arm/mach-s5pv210/mach-smdkv210.c +1 -0
@@ -31,6 +31,7 @@
 #include <plat/ata.h>
 #include <plat/iic.h>
 #include <plat/keypad.h>
+#include <plat/pm.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART

registers */ #define SMDKV210_UCON_DEFAULT
(S3C2410_UCON_TXILEVEL | \ @@ -145,6 +146,8 @@ static void
__init smdkv210_map_io(void)
static void __init smdkv210_machine_init(void)
{

arch/arm/mach-s5pv210/mach-smdkv210.c +2 -0
+	s3c_pm_init();
+
 	samsung_keypad_set_platdata(&smdkv210_keypad_data);
 	s3c24xx_ts_set_platdata(&s3c_ts_platform);
arch/arm/mach-s5pv210/pm.c new file +12 -0
new file mode 100644
index 0000000..549d792
@@ -0,0 +1,166 @@
+/* linux/arch/arm/mach-s5pv210/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * S5PV210 - Power Management support
+ *
+ * Based on arch/arm/mach-s3c2410/pm.c
+ * Copyright (c) 2006 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.

arch/arm/mach-s5pv210/pm.c new file +118 -0
+*/
+
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/io.h>
+
+#include <plat/cpu.h>
+#include <plat/pm.h>
+#include <plat/regs-timer.h>
+
+#include <mach/regs-irq.h>
+#include <mach/regs-clock.h>
+
+static struct sleep_save s5pv210_core_save[] = {
+	/* Clock source */
+	SAVE_ITEM(S5P_CLK_SRC0),
+	SAVE_ITEM(S5P_CLK_SRC1),
+	SAVE_ITEM(S5P_CLK_SRC2),
+	SAVE_ITEM(S5P_CLK_SRC3),
+	SAVE_ITEM(S5P_CLK_SRC4),
+	SAVE_ITEM(S5P_CLK_SRC5),
+	SAVE_ITEM(S5P_CLK_SRC6),
+
+	/* Clock source Mask */
+	SAVE_ITEM(S5P_CLK_SRC_MASK0),
+	SAVE_ITEM(S5P_CLK_SRC_MASK1),
+
+	/* Clock Divider */
+	SAVE_ITEM(S5P_CLK_DIV0),
+	SAVE_ITEM(S5P_CLK_DIV1),
+	SAVE_ITEM(S5P_CLK_DIV2),
+	SAVE_ITEM(S5P_CLK_DIV3),
+	SAVE_ITEM(S5P_CLK_DIV4),
+	SAVE_ITEM(S5P_CLK_DIV5),
+	SAVE_ITEM(S5P_CLK_DIV6),
+	SAVE_ITEM(S5P_CLK_DIV7),
+
+	/* Clock Main Gate */
+	SAVE_ITEM(S5P_CLKGATE_MAIN0),
+	SAVE_ITEM(S5P_CLKGATE_MAIN1),
+	SAVE_ITEM(S5P_CLKGATE_MAIN2),
+
+	/* Clock source Peri Gate */
+	SAVE_ITEM(S5P_CLKGATE_PERI0),
+	SAVE_ITEM(S5P_CLKGATE_PERI1),
+
+	/* Clock source SCLK Gate */
+	SAVE_ITEM(S5P_CLKGATE_SCLK0),
+	SAVE_ITEM(S5P_CLKGATE_SCLK1),
+
+	/* Clock IP Clock gate */
+	SAVE_ITEM(S5P_CLKGATE_IP0),
+	SAVE_ITEM(S5P_CLKGATE_IP1),
+	SAVE_ITEM(S5P_CLKGATE_IP2),
+	SAVE_ITEM(S5P_CLKGATE_IP3),
+	SAVE_ITEM(S5P_CLKGATE_IP4),
+
+	/* Clock Blcok and Bus gate */
+	SAVE_ITEM(S5P_CLKGATE_BLOCK),
+	SAVE_ITEM(S5P_CLKGATE_BUS0),
+
+	/* Clock ETC */
+	SAVE_ITEM(S5P_CLK_OUT),
+	SAVE_ITEM(S5P_MDNIE_SEL),
+
+	/* PWM Register */
+	SAVE_ITEM(S3C2410_TCFG0),
+	SAVE_ITEM(S3C2410_TCFG1),
+	SAVE_ITEM(S3C64XX_TINT_CSTAT),
+	SAVE_ITEM(S3C2410_TCON),
+	SAVE_ITEM(S3C2410_TCNTB(0)),
+	SAVE_ITEM(S3C2410_TCMPB(0)),
+	SAVE_ITEM(S3C2410_TCNTO(0)),
+};
+
+void s5pv210_cpu_suspend(void)
+{
+	unsigned long tmp;
+
+	/* issue the standby signal into the pm unit. Note, we
+	 * issue a write-buffer drain just in case */
+
+	tmp = 0;
+
+	asm("b 1f\n\t"
+	    ".align 5\n\t"
+	    "1:\n\t"
+	    "mcr p15, 0, %0, c7, c10, 5\n\t"
+	    "mcr p15, 0, %0, c7, c10, 4\n\t"
+	    "wfi" : : "r" (tmp));
+
+	/* we should never get past here */
+	panic("sleep resumed to originator?");
+}
+
+static void s5pv210_pm_prepare(void)
+{
+	unsigned int tmp;
+
+	/* ensure at least INFORM0 has the resume address */
+	__raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
+
+	tmp = __raw_readl(S5P_SLEEP_CFG);
+	tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
+	__raw_writel(tmp, S5P_SLEEP_CFG);
+
+	/* WFI for SLEEP mode configuration by SYSCON */
+	tmp = __raw_readl(S5P_PWR_CFG);
+	tmp &= S5P_CFG_WFI_CLEAN;
+	tmp |= S5P_CFG_WFI_SLEEP;
+	__raw_writel(tmp, S5P_PWR_CFG);
+
+	/* SYSCON interrupt handling disable */
+	tmp = __raw_readl(S5P_OTHERS);
+	tmp |= S5P_OTHER_SYSC_INTOFF;
+	__raw_writel(tmp, S5P_OTHERS);
+
+	s3c_pm_do_save(s5pv210_core_save,

ARRAY_SIZE(s5pv210_core_save)); +}

arch/arm/mach-s5pv210/pm.c new file +19 -0
+
+static int s5pv210_pm_add(struct sys_device *sysdev)
+{
+	pm_cpu_prep = s5pv210_pm_prepare;
+	pm_cpu_sleep = s5pv210_cpu_suspend;
+
+	return 0;
+}
+
+static int s5pv210_pm_resume(struct sys_device *dev)
+{
+	u32 tmp;
+
+	tmp = __raw_readl(S5P_OTHERS);
+	tmp |= (S5P_OTHERS_RET_IO | S5P_OTHERS_RET_CF |\
+		S5P_OTHERS_RET_MMC | S5P_OTHERS_RET_UART);
+	__raw_writel(tmp , S5P_OTHERS);
+
+	s3c_pm_do_restore_core(s5pv210_core_save,

ARRAY_SIZE(s5pv210_core_save)); +

arch/arm/mach-s5pv210/pm.c new file +11 -0
+	return 0;
+}
+
+static struct sysdev_driver s5pv210_pm_driver = {
+	.add		= s5pv210_pm_add,
+	.resume		= s5pv210_pm_resume,
+};
+
+static __init int s5pv210_pm_drvinit(void)
+{
+	return sysdev_driver_register(&s5pv210_sysclass,

&s5pv210_pm_driver); +}

arch/arm/mach-s5pv210/pm.c new file +1 -0
+arch_initcall(s5pv210_pm_drvinit);
(quoted diff) +0 -0

b/arch/arm/mach-s5pv210/sleep.S new file mode 100644 index 0000000..4124fd4

arch/arm/mach-s5pv210/sleep.S new file +14 -0
@@ -0,0 +1,171 @@
+/* linux/arch/arm/plat-s5p/sleep.S
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * S5PV210 power Manager (Suspend-To-RAM) support
+ * Based on S3C2410 sleep code by:
+ * 	Ben Dooks, (c) 2004 Simtec Electronics
+ *
+ * Based on PXA/SA1100 sleep code by:
+ *	Nicolas Pitre, (c) 2002 Monta Vista Software Inc
+ *	Cliff Brake, (c) 2001
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/

arch/arm/mach-s5pv210/sleep.S new file +11 -0
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/memory.h>
+
+	.text
+
+	/* s3c_cpu_save
+	 *
+	 * entry:
+	 *	r0 = save address (virtual addr of

s3c_sleep_save_phys)

arch/arm/mach-s5pv210/sleep.S new file +9 -0
+	*/
+
+ENTRY(s3c_cpu_save)
+
+	stmfd	sp!, { r3 - r12, lr }
+
+	mrc	p15, 0, r4, c13, c0, 0	@ FCSE/PID
+	mrc	p15, 0, r5, c3, c0, 0	@ Domain ID
+	mrc	p15, 0, r6, c2, c0, 0	@ Translation Table

BASE0

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mrc	p15, 0, r7, c2, c0, 1	@ Translation Table

BASE1

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mrc	p15, 0, r8, c2, c0, 2	@ Translation Table

Control

arch/arm/mach-s5pv210/sleep.S new file +2 -0
+	mrc	p15, 0, r9, c1, c0, 0	@ Control register
+	mrc	p15, 0, r10, c1, c0, 1	@ Auxiliary control

register

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mrc	p15, 0, r11, c1, c0, 2	@ Co-processor

access controls

arch/arm/mach-s5pv210/sleep.S new file +41 -0
+	mrc	p15, 0, r12, c10, c2, 0	@ Read PRRR
+	mrc	p15, 0, r3, c10, c2, 1	@ READ NMRR
+
+	stmia	r0, { r3 - r13 }
+
+	bl	s3c_pm_cb_flushcache
+
+	ldr	r0, =pm_cpu_sleep
+	ldr	r0, [ r0 ]
+	mov	pc, r0
+
+resume_with_mmu:
+	/*
+	 * After MMU is turned on, restore the previous MMU table.
+	 */
+	ldr	r9 , =(PAGE_OFFSET - PHYS_OFFSET)
+	add	r4, r4, r9
+	str	r12, [r4]
+
+	ldmfd	sp!, { r3 - r12, pc }
+
+	.ltorg
+
+	.data
+
+	.global	s3c_sleep_save_phys
+s3c_sleep_save_phys:
+	.word	0
+
+	/* sleep magic, to allow the bootloader to check for an valid
+	 * image to resume to. Must be the first word before the
+	 * s3c_cpu_resume entry.
+	*/
+
+	.word	0x2bedf00d
+
+	/* s3c_cpu_resume
+	 *
+	 * resume code entry for bootloader to call
+	 *
+	 * we must put this code here in the data segment as we have

no

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	 * other way of restoring the stack pointer after sleep, and

we

arch/arm/mach-s5pv210/sleep.S new file +9 -0
+	 * must not write to the code segment (code is read-only)
+	*/
+
+ENTRY(s3c_cpu_resume)
+	mov	r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
+	msr	cpsr_c, r0
+
+	mov	r1, #0
+	mcr	p15, 0, r1, c8, c7, 0		@ invalidate

TLBs

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mcr	p15, 0, r1, c7, c5, 0		@ invalidate

I Cache +

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	ldr	r0, s3c_sleep_save_phys		@ address

of restore block

arch/arm/mach-s5pv210/sleep.S new file +6 -0
+	ldmia	r0, { r3 - r13 }
+
+	mcr	p15, 0, r4, c13, c0, 0		@ FCSE/PID
+	mcr	p15, 0, r5, c3, c0, 0		@ Domain ID
+
+	mcr	p15, 0, r8, c2, c0, 2		@

Translation Table Control

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mcr	p15, 0, r7, c2, c0, 1		@

Translation Table BASE1

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mcr	p15, 0, r6, c2, c0, 0		@

Translation Table BASE0 +

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mcr	p15, 0, r10, c1, c0, 1		@ Auxiliary

control register +

arch/arm/mach-s5pv210/sleep.S new file +2 -0
+	mov	r0, #0
+	mcr	p15, 0, r0, c8, c7, 0		@ Invalidate

I & D TLB +

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mov	r0, #0				@ restore

copro access

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mcr	p15, 0, r11, c1, c0, 2		@

Co-processor access

arch/arm/mach-s5pv210/sleep.S new file +3 -0
+	mcr 	p15, 0, r0, c7, c5, 4
+
+	mcr	p15, 0, r12, c10, c2, 0		@ write

PRRR

arch/arm/mach-s5pv210/sleep.S new file +4 -0
+	mcr	p15, 0, r3, c10, c2, 1		@ write NMRR
+
+	/*
+	 * In Cortex-A8, when MMU is turned on, the pipeline is

flushed.

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	 * And there are no valid entries in the MMU table at this

point.

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	 * So before turning on the MMU, the MMU entry for the DRAM

address

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	 * range is added. After the MMU is turned on, the other

entries

arch/arm/mach-s5pv210/sleep.S new file +28 -0
+	 * in the MMU table will be restored.
+	*/
+
+	/* r6 = Translation Table BASE0 */
+	mov	r4, r6
+	mov	r4, r4, LSR #14
+	mov	r4, r4, LSL #14
+
+	/* Load address for adding to MMU table list */
+	ldr	r11, =0xE010F000
+	ldr	r10, [r11, #0]
+	mov	r10, r10, LSR #18
+	bic	r10, r10, #0x3
+	orr	r4, r4, r10
+
+	/* Calculate MMU table entry */
+	mov 	r10, r10, LSL #18
+	ldr	r5, =0x40E
+	orr	r10, r10, r5
+
+	/* Back up originally data */
+	ldr	r12, [r4]
+
+	/* Add calculated MMU table entry into MMU table list */
+	str	r10, [r4]
+
+	ldr	r2, =resume_with_mmu
+	mcr	p15, 0, r9, c1, c0, 0		@ turn on

MMU, etc +

arch/arm/mach-s5pv210/sleep.S new file +5 -0
+	nop
+	nop
+	nop
+	nop
+	nop					@ second-to-last

before mmu +

arch/arm/mach-s5pv210/sleep.S new file +1 -0
+	mov	pc, r2				@ go back

to virtual address +

arch/arm/mach-s5pv210/sleep.S new file +2 -0
+	.ltorg
+
arch/arm/plat-s5p/Makefile +2 -0
index f3e917e..4b838f6 100644
@@ -18,6 +18,8 @@ obj-y				+= cpu.o
 obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
+obj-$(CONFIG_PM)		+= pm.o
+obj-$(CONFIG_PM)		+= irq-pm.o
 
 # devices
 
(quoted diff) +0 -0

b/arch/arm/plat-s5p/include/plat/irqs.h index 3fb3a3a..2f8128a 100644

arch/arm/plat-s5p/include/plat/irqs.h +1 -0
@@ -94,4 +94,5 @@
 						((irq) -
 S5P_EINT_BASE1) : \ ((irq) + 16 - S5P_EINT_BASE2))
 
+#define IRQ_EINT_BIT(x)		EINT_OFFSET(x)
 #endif /* __ASM_PLAT_S5P_IRQS_H */
arch/arm/plat-s5p/irq-pm.c new file +11 -0
new file mode 100644
index 0000000..dc33b9e
@@ -0,0 +1,93 @@
+/* linux/arch/arm/plat-s5p/irq-pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * Based on arch/arm/plat-s3c24xx/irq-pm.c,
+ * Copyright (c) 2003,2004 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *	http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.

arch/arm/plat-s5p/irq-pm.c new file +18 -0
+*/
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/sysdev.h>
+
+#include <plat/cpu.h>
+#include <plat/irqs.h>
+#include <plat/pm.h>
+#include <mach/map.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/regs-irq.h>
+
+/* state for IRQs over sleep */
+
+/* default is to allow for EINT0..EINT31, and IRQ_RTC_TIC,

IRQ_RTC_ALARM,
+ * as wakeup sources
+ *
+ * set bit to 1 in allow bitfield to enable the wakeup settings on it

arch/arm/plat-s5p/irq-pm.c new file +59 -0
+*/
+
+unsigned long s3c_irqwake_intallow	= 0x00000006L;
+unsigned long s3c_irqwake_eintallow	= 0xffffffffL;
+
+int s3c_irq_wake(unsigned int irqno, unsigned int state)
+{
+	unsigned long irqbit;
+
+	switch (irqno) {
+	case IRQ_RTC_TIC:
+	case IRQ_RTC_ALARM:
+		irqbit = 1 << (irqno + 1 - IRQ_RTC_ALARM);
+		if (!state)
+			s3c_irqwake_intmask |= irqbit;
+		else
+			s3c_irqwake_intmask &= ~irqbit;
+		break;
+	default:
+		return -ENOENT;
+	}
+	return 0;
+}
+
+static struct sleep_save eint_save[] = {
+	SAVE_ITEM(S5P_EINT_CON(0)),
+	SAVE_ITEM(S5P_EINT_CON(1)),
+	SAVE_ITEM(S5P_EINT_CON(2)),
+	SAVE_ITEM(S5P_EINT_CON(3)),
+
+	SAVE_ITEM(S5P_EINT_FLTCON(0)),
+	SAVE_ITEM(S5P_EINT_FLTCON(1)),
+	SAVE_ITEM(S5P_EINT_FLTCON(2)),
+	SAVE_ITEM(S5P_EINT_FLTCON(3)),
+	SAVE_ITEM(S5P_EINT_FLTCON(4)),
+	SAVE_ITEM(S5P_EINT_FLTCON(5)),
+	SAVE_ITEM(S5P_EINT_FLTCON(6)),
+	SAVE_ITEM(S5P_EINT_FLTCON(7)),
+
+	SAVE_ITEM(S5P_EINT_MASK(0)),
+	SAVE_ITEM(S5P_EINT_MASK(1)),
+	SAVE_ITEM(S5P_EINT_MASK(2)),
+	SAVE_ITEM(S5P_EINT_MASK(3)),
+};
+
+int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+{
+	s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
+
+	return 0;
+}
+
+int s3c24xx_irq_resume(struct sys_device *dev)
+{
+	s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
+
+	return 0;
+}
+
arch/arm/plat-s5p/pm.c new file +12 -0
new file mode 100644
index 0000000..d592b63
@@ -0,0 +1,52 @@
+/* linux/arch/arm/plat-s5p/pm.c
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * S5P Power Manager (Suspend-To-RAM) support
+ *
+ * Based on arch/arm/plat-s3c24xx/pm.c
+ * Copyright (c) 2004,2006 Simtec Electronics
+ *	Ben Dooks <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or

modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.

arch/arm/plat-s5p/pm.c new file +10 -0
+*/
+
+#include <linux/suspend.h>
+#include <plat/pm.h>
+
+#define PFX "s5p pm: "
+
+/* s3c_pm_check_resume_pin
+ *
+ * check to see if the pin is configured correctly for sleep mode,

and
+ * make any necessary adjustments if it is not

arch/arm/plat-s5p/pm.c new file +3 -0
+*/
+
+static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int

irqoffs) +{

arch/arm/plat-s5p/pm.c new file +23 -0
+	/* nothing here yet */
+}
+
+/* s3c_pm_configure_extint
+ *
+ * configure all external interrupt pins
+*/
+
+void s3c_pm_configure_extint(void)
+{
+	/* nothing here yet */
+}
+
+void s3c_pm_restore_core(void)
+{
+	/* nothing here yet */
+}
+
+void s3c_pm_save_core(void)
+{
+	/* nothing here yet */
+}
+
(quoted diff) +0 -0

b/arch/arm/plat-samsung/pm-gpio.c index 7df03f8..9652820 100644

arch/arm/plat-samsung/pm-gpio.c +1 -1
@@ -192,7 +192,7 @@ struct s3c_gpio_pm s3c_gpio_pm_2bit = {
 	.resume = s3c_gpio_pm_2bit_resume,
 };
 
-#ifdef CONFIG_ARCH_S3C64XX
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 static void s3c_gpio_pm_4bit_save(struct s3c_gpio_chip *chip)
 {
 	chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);

arch/arm/plat-samsung/pm-gpio.c struct s3c_gpio_pm s3c_gpio_pm_4bit = { · line 308

Quoted 8 lines
arch/arm/plat-samsung/pm-gpio.c +1 -1
@@ -302,7 +302,7 @@ struct s3c_gpio_pm s3c_gpio_pm_4bit = {
 	.save	= s3c_gpio_pm_4bit_save,
 	.resume = s3c_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
 /**
  * s3c_pm_save_gpio() - save gpio chip data for suspend

Hi,

I've applied the patch to 2.6.36-rc4 (merge with kgene/for-next). It works at GONI target.

Unfortunately, when debug is enabled:
CONFIG_SAMSUNG_PM_DEBUG (available under System Type-> S3C2410 PM Suspend debug) it doesn't compile.

Error log:

arch/arm/plat-samsung/pm.c: In function ?s3c_pm_save_uart?:
arch/arm/plat-samsung/pm.c:80: error: implicit declaration of function ?S3C_VA_UARTx? arch/arm/plat-samsung/pm.c:80: warning: initialization makes pointer from integer without a cast arch/arm/plat-samsung/pm.c:
In function ?s3c_pm_restore_uart?: arch/arm/plat-samsung/pm.c:106:
warning: initialization makes pointer from integer without a cast make[1]: *** [arch/arm/plat-samsung/pm.o] Error 1 make: *** [arch/arm/plat-samsung] Error 2

It looks that, this flag enables some legacy code. When I comment this code the power management works as expected.

Signature · 6 lines
Best regards,

Lukasz Majewski

Samsung Poland R&D Center
Platform Group