* [PATCH 0/2] ARM: EXYNOS3250: Add support EXYNOS3250 suspend/resume.
@ 2014-09-26 7:23 ` Jonghwa Lee
0 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-samsung-soc, linux-arm-kernel, linux-kernel
Cc: kgene.kim, cw00.choi, vikas.sajjan, Jonghwa Lee
This patches adds and modifies exynos suspend driver to support exynos3250's
suspend/resume. To work suspend/resume, it also needs a work at pmu driver.
It'll be supported after refactoring job on pmu driver is done.
Jonghwa Lee (2):
ARM: EXYNOS: suspend: Make restoring registers into selectable
option.
ARM: EXYNOS3250: Add initial support EXYNOS3250 suspend/resume.
arch/arm/mach-exynos/regs-pmu.h | 4 +++
arch/arm/mach-exynos/suspend.c | 70 +++++++++++++++++++++++++++++----------
2 files changed, 56 insertions(+), 18 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/2] ARM: EXYNOS3250: Add support EXYNOS3250 suspend/resume.
@ 2014-09-26 7:23 ` Jonghwa Lee
0 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-arm-kernel
This patches adds and modifies exynos suspend driver to support exynos3250's
suspend/resume. To work suspend/resume, it also needs a work at pmu driver.
It'll be supported after refactoring job on pmu driver is done.
Jonghwa Lee (2):
ARM: EXYNOS: suspend: Make restoring registers into selectable
option.
ARM: EXYNOS3250: Add initial support EXYNOS3250 suspend/resume.
arch/arm/mach-exynos/regs-pmu.h | 4 +++
arch/arm/mach-exynos/suspend.c | 70 +++++++++++++++++++++++++++++----------
2 files changed, 56 insertions(+), 18 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: EXYNOS: suspend: Make restoring registers into selectable option.
2014-09-26 7:23 ` Jonghwa Lee
@ 2014-09-26 7:23 ` Jonghwa Lee
-1 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-samsung-soc, linux-arm-kernel, linux-kernel
Cc: kgene.kim, cw00.choi, vikas.sajjan, Jonghwa Lee
Some EXYNOS series may not requried to save ROM registers as it's default
for now. This patch makes restoring registers into machine-specific option.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
arch/arm/mach-exynos/suspend.c | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index f5d9773..b41d146 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -48,23 +48,28 @@ struct exynos_wkup_irq {
u32 mask;
};
-static struct sleep_save exynos5_sys_save[] = {
- SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
+static struct sleep_save exynos_save_regs[] = {
+ /* SROM side */
+ SAVE_ITEM(S5P_SROM_BW),
+ SAVE_ITEM(S5P_SROM_BC0),
+ SAVE_ITEM(S5P_SROM_BC1),
+ SAVE_ITEM(S5P_SROM_BC2),
+ SAVE_ITEM(S5P_SROM_BC3),
};
-static struct sleep_save exynos_core_save[] = {
- /* SROM side */
+static struct sleep_save exynos5_save_regs[] = {
SAVE_ITEM(S5P_SROM_BW),
SAVE_ITEM(S5P_SROM_BC0),
SAVE_ITEM(S5P_SROM_BC1),
SAVE_ITEM(S5P_SROM_BC2),
SAVE_ITEM(S5P_SROM_BC3),
+ SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
};
struct exynos_pm_data {
const struct exynos_wkup_irq *wkup_irq;
- struct sleep_save *extra_save;
- int num_extra_save;
+ struct sleep_save *save_regs;
+ int num_save_regs;
unsigned int wake_disable_mask;
unsigned int *release_ret_regs;
@@ -165,11 +170,9 @@ static void exynos_pm_prepare(void)
/* Set wake-up mask registers */
exynos_pm_set_wakeup_mask();
- s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));
-
- if (pm_data->extra_save)
- s3c_pm_do_save(pm_data->extra_save,
- pm_data->num_extra_save);
+ if (pm_data->save_regs)
+ s3c_pm_do_save(pm_data->save_regs,
+ pm_data->num_save_regs);
exynos_pm_enter_sleep_mode();
}
@@ -203,11 +206,9 @@ static void exynos_pm_resume(void)
/* For release retention */
exynos_pm_release_retention();
- if (pm_data->extra_save)
- s3c_pm_do_restore_core(pm_data->extra_save,
- pm_data->num_extra_save);
-
- s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
+ if (pm_data->save_regs)
+ s3c_pm_do_restore_core(pm_data->save_regs,
+ pm_data->num_save_regs);
if (cpuid == ARM_CPU_PART_CORTEX_A9)
scu_enable(S5P_VA_SCU);
@@ -291,6 +292,8 @@ static const struct exynos_pm_data exynos4_pm_data = {
.wkup_irq = exynos4_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
.release_ret_regs = exynos_release_ret_regs,
+ .save_regs = exynos_save_regs,
+ .num_save_regs = ARRAY_SIZE(exynos_save_regs),
.pm_suspend = exynos_pm_suspend,
.pm_resume = exynos_pm_resume,
.pm_prepare = exynos_pm_prepare,
@@ -301,8 +304,8 @@ static const struct exynos_pm_data exynos5250_pm_data = {
.wkup_irq = exynos5250_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
.release_ret_regs = exynos_release_ret_regs,
- .extra_save = exynos5_sys_save,
- .num_extra_save = ARRAY_SIZE(exynos5_sys_save),
+ .save_regs = exynos5_save_regs,
+ .num_save_regs = ARRAY_SIZE(exynos5_save_regs),
.pm_suspend = exynos_pm_suspend,
.pm_resume = exynos_pm_resume,
.pm_prepare = exynos_pm_prepare,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: EXYNOS: suspend: Make restoring registers into selectable option.
@ 2014-09-26 7:23 ` Jonghwa Lee
0 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-arm-kernel
Some EXYNOS series may not requried to save ROM registers as it's default
for now. This patch makes restoring registers into machine-specific option.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
arch/arm/mach-exynos/suspend.c | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index f5d9773..b41d146 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -48,23 +48,28 @@ struct exynos_wkup_irq {
u32 mask;
};
-static struct sleep_save exynos5_sys_save[] = {
- SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
+static struct sleep_save exynos_save_regs[] = {
+ /* SROM side */
+ SAVE_ITEM(S5P_SROM_BW),
+ SAVE_ITEM(S5P_SROM_BC0),
+ SAVE_ITEM(S5P_SROM_BC1),
+ SAVE_ITEM(S5P_SROM_BC2),
+ SAVE_ITEM(S5P_SROM_BC3),
};
-static struct sleep_save exynos_core_save[] = {
- /* SROM side */
+static struct sleep_save exynos5_save_regs[] = {
SAVE_ITEM(S5P_SROM_BW),
SAVE_ITEM(S5P_SROM_BC0),
SAVE_ITEM(S5P_SROM_BC1),
SAVE_ITEM(S5P_SROM_BC2),
SAVE_ITEM(S5P_SROM_BC3),
+ SAVE_ITEM(EXYNOS5_SYS_I2C_CFG),
};
struct exynos_pm_data {
const struct exynos_wkup_irq *wkup_irq;
- struct sleep_save *extra_save;
- int num_extra_save;
+ struct sleep_save *save_regs;
+ int num_save_regs;
unsigned int wake_disable_mask;
unsigned int *release_ret_regs;
@@ -165,11 +170,9 @@ static void exynos_pm_prepare(void)
/* Set wake-up mask registers */
exynos_pm_set_wakeup_mask();
- s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));
-
- if (pm_data->extra_save)
- s3c_pm_do_save(pm_data->extra_save,
- pm_data->num_extra_save);
+ if (pm_data->save_regs)
+ s3c_pm_do_save(pm_data->save_regs,
+ pm_data->num_save_regs);
exynos_pm_enter_sleep_mode();
}
@@ -203,11 +206,9 @@ static void exynos_pm_resume(void)
/* For release retention */
exynos_pm_release_retention();
- if (pm_data->extra_save)
- s3c_pm_do_restore_core(pm_data->extra_save,
- pm_data->num_extra_save);
-
- s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
+ if (pm_data->save_regs)
+ s3c_pm_do_restore_core(pm_data->save_regs,
+ pm_data->num_save_regs);
if (cpuid == ARM_CPU_PART_CORTEX_A9)
scu_enable(S5P_VA_SCU);
@@ -291,6 +292,8 @@ static const struct exynos_pm_data exynos4_pm_data = {
.wkup_irq = exynos4_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
.release_ret_regs = exynos_release_ret_regs,
+ .save_regs = exynos_save_regs,
+ .num_save_regs = ARRAY_SIZE(exynos_save_regs),
.pm_suspend = exynos_pm_suspend,
.pm_resume = exynos_pm_resume,
.pm_prepare = exynos_pm_prepare,
@@ -301,8 +304,8 @@ static const struct exynos_pm_data exynos5250_pm_data = {
.wkup_irq = exynos5250_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
.release_ret_regs = exynos_release_ret_regs,
- .extra_save = exynos5_sys_save,
- .num_extra_save = ARRAY_SIZE(exynos5_sys_save),
+ .save_regs = exynos5_save_regs,
+ .num_save_regs = ARRAY_SIZE(exynos5_save_regs),
.pm_suspend = exynos_pm_suspend,
.pm_resume = exynos_pm_resume,
.pm_prepare = exynos_pm_prepare,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: EXYNOS3250: Add initial support EXYNOS3250 suspend/resume.
2014-09-26 7:23 ` Jonghwa Lee
@ 2014-09-26 7:23 ` Jonghwa Lee
-1 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-samsung-soc, linux-arm-kernel, linux-kernel
Cc: kgene.kim, cw00.choi, vikas.sajjan, Jonghwa Lee
It adds data and callback needed for exynos3250's suspend/resume.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
arch/arm/mach-exynos/regs-pmu.h | 4 ++++
arch/arm/mach-exynos/suspend.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index 322f132..b5125dc1 100644
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -131,6 +131,10 @@
#define S5P_CORE_LOCAL_PWR_EN 0x3
#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
+/* Only for EXYNOS3250 */
+#define S5P_PAD_RET_MMCC_OPTION 0x30C8
+#define S5P_PAD_RET_SPI_OPTION 0x31C8
+
/* Only for EXYNOS4210 */
#define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154
#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index b41d146..de7d6d5 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -87,6 +87,12 @@ struct exynos_pm_data *pm_data;
static u32 exynos_irqwake_intmask = 0xffffffff;
+static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {
+ { 105, BIT(1) }, /* RTC alarm */
+ { 106, BIT(2) }, /* RTC tick */
+ { /* sentinel */ },
+};
+
static const struct exynos_wkup_irq exynos4_wkup_irq[] = {
{ 76, BIT(1) }, /* RTC alarm */
{ 77, BIT(2) }, /* RTC tick */
@@ -99,6 +105,19 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = {
{ /* sentinel */ },
};
+unsigned int exynos3250_release_ret_regs[] = {
+ S5P_PAD_RET_MAUDIO_OPTION,
+ S5P_PAD_RET_GPIO_OPTION,
+ S5P_PAD_RET_UART_OPTION,
+ S5P_PAD_RET_MMCA_OPTION,
+ S5P_PAD_RET_MMCB_OPTION,
+ S5P_PAD_RET_MMCC_OPTION,
+ S5P_PAD_RET_EBIA_OPTION,
+ S5P_PAD_RET_EBIB_OPTION,
+ S5P_PAD_RET_SPI_OPTION,
+ REG_TABLE_END,
+};
+
unsigned int exynos_release_ret_regs[] = {
S5P_PAD_RET_MAUDIO_OPTION,
S5P_PAD_RET_GPIO_OPTION,
@@ -288,6 +307,15 @@ static const struct platform_suspend_ops exynos_suspend_ops = {
.valid = suspend_valid_only_mem,
};
+static const struct exynos_pm_data exynos3250_pm_data = {
+ .wkup_irq = exynos3250_wkup_irq,
+ .release_ret_regs = exynos3250_release_ret_regs,
+ .pm_suspend = exynos_pm_suspend,
+ .pm_resume = exynos_pm_resume,
+ .pm_prepare = exynos_pm_prepare,
+ .cpu_suspend = exynos_cpu_suspend,
+};
+
static const struct exynos_pm_data exynos4_pm_data = {
.wkup_irq = exynos4_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
@@ -314,6 +342,9 @@ static const struct exynos_pm_data exynos5250_pm_data = {
static struct of_device_id exynos_pmu_of_device_ids[] = {
{
+ .compatible = "samsung,exynos3250-pmu",
+ .data = &exynos3250_pm_data,
+ }, {
.compatible = "samsung,exynos4210-pmu",
.data = &exynos4_pm_data,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: EXYNOS3250: Add initial support EXYNOS3250 suspend/resume.
@ 2014-09-26 7:23 ` Jonghwa Lee
0 siblings, 0 replies; 6+ messages in thread
From: Jonghwa Lee @ 2014-09-26 7:23 UTC (permalink / raw)
To: linux-arm-kernel
It adds data and callback needed for exynos3250's suspend/resume.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
---
arch/arm/mach-exynos/regs-pmu.h | 4 ++++
arch/arm/mach-exynos/suspend.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index 322f132..b5125dc1 100644
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -131,6 +131,10 @@
#define S5P_CORE_LOCAL_PWR_EN 0x3
#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
+/* Only for EXYNOS3250 */
+#define S5P_PAD_RET_MMCC_OPTION 0x30C8
+#define S5P_PAD_RET_SPI_OPTION 0x31C8
+
/* Only for EXYNOS4210 */
#define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154
#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index b41d146..de7d6d5 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -87,6 +87,12 @@ struct exynos_pm_data *pm_data;
static u32 exynos_irqwake_intmask = 0xffffffff;
+static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {
+ { 105, BIT(1) }, /* RTC alarm */
+ { 106, BIT(2) }, /* RTC tick */
+ { /* sentinel */ },
+};
+
static const struct exynos_wkup_irq exynos4_wkup_irq[] = {
{ 76, BIT(1) }, /* RTC alarm */
{ 77, BIT(2) }, /* RTC tick */
@@ -99,6 +105,19 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = {
{ /* sentinel */ },
};
+unsigned int exynos3250_release_ret_regs[] = {
+ S5P_PAD_RET_MAUDIO_OPTION,
+ S5P_PAD_RET_GPIO_OPTION,
+ S5P_PAD_RET_UART_OPTION,
+ S5P_PAD_RET_MMCA_OPTION,
+ S5P_PAD_RET_MMCB_OPTION,
+ S5P_PAD_RET_MMCC_OPTION,
+ S5P_PAD_RET_EBIA_OPTION,
+ S5P_PAD_RET_EBIB_OPTION,
+ S5P_PAD_RET_SPI_OPTION,
+ REG_TABLE_END,
+};
+
unsigned int exynos_release_ret_regs[] = {
S5P_PAD_RET_MAUDIO_OPTION,
S5P_PAD_RET_GPIO_OPTION,
@@ -288,6 +307,15 @@ static const struct platform_suspend_ops exynos_suspend_ops = {
.valid = suspend_valid_only_mem,
};
+static const struct exynos_pm_data exynos3250_pm_data = {
+ .wkup_irq = exynos3250_wkup_irq,
+ .release_ret_regs = exynos3250_release_ret_regs,
+ .pm_suspend = exynos_pm_suspend,
+ .pm_resume = exynos_pm_resume,
+ .pm_prepare = exynos_pm_prepare,
+ .cpu_suspend = exynos_cpu_suspend,
+};
+
static const struct exynos_pm_data exynos4_pm_data = {
.wkup_irq = exynos4_wkup_irq,
.wake_disable_mask = ((0xFF << 8) | (0x1F << 1)),
@@ -314,6 +342,9 @@ static const struct exynos_pm_data exynos5250_pm_data = {
static struct of_device_id exynos_pmu_of_device_ids[] = {
{
+ .compatible = "samsung,exynos3250-pmu",
+ .data = &exynos3250_pm_data,
+ }, {
.compatible = "samsung,exynos4210-pmu",
.data = &exynos4_pm_data,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-26 7:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-26 7:23 [PATCH 0/2] ARM: EXYNOS3250: Add support EXYNOS3250 suspend/resume Jonghwa Lee
2014-09-26 7:23 ` Jonghwa Lee
2014-09-26 7:23 ` [PATCH 1/2] ARM: EXYNOS: suspend: Make restoring registers into selectable option Jonghwa Lee
2014-09-26 7:23 ` Jonghwa Lee
2014-09-26 7:23 ` [PATCH 2/2] ARM: EXYNOS3250: Add initial support EXYNOS3250 suspend/resume Jonghwa Lee
2014-09-26 7:23 ` Jonghwa Lee
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.