RE: [PATCH 3/5] ARM: EXYNOS4: Add support PM for EXYNOS4212
Rafael J. Wysocki wrote:
On Friday, August 26, 2011, Kukjin Kim wrote:
MyungJoo Ham wrote:
On Wed, Aug 24, 2011 at 10:25 PM, Kukjin Kim kgene@samsung.com
wrote:
From: Jonghwan Choi jhbird.c...@samsung.com
This patch moves regarding clock stuff of PM into clock
file to support PM on EXYNOS4210 and EXYNOS4212 with one
single kernel image. Because some clock registers are
different on each SoCs.
Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos4/clock-exynos4210.c| 38 ++
arch/arm/mach-exynos4/clock-exynos4212.c| 34 +
arch/arm/mach-exynos4/clock.c | 89
+++
arch/arm/mach-exynos4/include/mach/regs-clock.h |4 +
arch/arm/mach-exynos4/pm.c | 79
++--
5 files changed, 172 insertions(+), 72 deletions(-)
diff --git a/arch/arm/mach-exynos4/clock-exynos4210.c
b/arch/arm/mach-
exynos4/clock-exynos4210.c
index fe74b91..a4b00b7 100644
--- a/arch/arm/mach-exynos4/clock-exynos4210.c
+++ b/arch/arm/mach-exynos4/clock-exynos4210.c
+static struct sleep_save exynos4210_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKSRC_LCD1),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_LCD1),
+ SAVE_ITEM(S5P_CLKSRC_MASK_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4210),
+ SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
+};
+
--- a/arch/arm/mach-exynos4/clock-exynos4212.c
+++ b/arch/arm/mach-exynos4/clock-exynos4212.c
+static struct sleep_save exynos4212_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
+};
+
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
+static struct sleep_save exynos4_clock_save[] = {
Hello,
Hi,
Is there any reason to have the following two
SAVE_ITEM(S5P_CLKSRC_IMAGE),
SAVE_ITEM(S5P_CLKDIV_IMAGE
defined at both clock-exynos4210.c and clock-exynos4212.c, not defined
at clock.c once?
Yes, I know. I just wanted to keep in mind there is a different
value(CLKGATE_IP_IMAGE) in regarding IMAGE clocks on each SoCs, and I
think
need it now. Anyway thanks for your pointing out.
Also, consider using CONFIG_PM_SLEEP rather than CONFIG_PM for
suspend/resume ops.
(Cc'ed Rafael)
Well, even though CONFIG_PM_SLEEP is used in regarding syscore_ops, in
this
case, using CONFIG_PM looks better.
If ARCH_SUSPEND_POSSIBLE will be selected, then CONFIG_SUSPEND is
selected
and CONFIG_PM_SLEEP is selected in kernel/power/Kconfig and of course,
ARCH_SUSPEND_POSSIBLE is selected in arch/arm/Kconfig. However above
everything depends on CONFIG_PM. So I think to use CONFIG_PM is more
reasonable. In addition, it is more popular in other mainline codes now.
Hi Rafael,
How do you think about this?
If you make syscore_ops depend on CONFIG_PM, they will be built but not
used when CONFIG_PM_RUNTIME is set and CONFIG_PM_SLEEP is unset. If
you
think that's acceptable, I guess you can do it (although you may get a
few defined but not used warnings in that case, which don't look nice).
Hmm...ok, I understand you mean CONFIG_PM_SLEEP is better in this case to
reduce useless warnings. Will use CONFIG_PM_SLEEP.
Rafael and MyungJoo, Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] ARM: EXYNOS4: Add support PM for EXYNOS4212
On Friday, August 26, 2011, Kukjin Kim wrote:
MyungJoo Ham wrote:
On Wed, Aug 24, 2011 at 10:25 PM, Kukjin Kim kgene@samsung.com
wrote:
From: Jonghwan Choi jhbird.c...@samsung.com
This patch moves regarding clock stuff of PM into clock
file to support PM on EXYNOS4210 and EXYNOS4212 with one
single kernel image. Because some clock registers are
different on each SoCs.
Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos4/clock-exynos4210.c| 38 ++
arch/arm/mach-exynos4/clock-exynos4212.c| 34 +
arch/arm/mach-exynos4/clock.c | 89
+++
arch/arm/mach-exynos4/include/mach/regs-clock.h |4 +
arch/arm/mach-exynos4/pm.c | 79
++--
5 files changed, 172 insertions(+), 72 deletions(-)
diff --git a/arch/arm/mach-exynos4/clock-exynos4210.c b/arch/arm/mach-
exynos4/clock-exynos4210.c
index fe74b91..a4b00b7 100644
--- a/arch/arm/mach-exynos4/clock-exynos4210.c
+++ b/arch/arm/mach-exynos4/clock-exynos4210.c
+static struct sleep_save exynos4210_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKSRC_LCD1),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_LCD1),
+ SAVE_ITEM(S5P_CLKSRC_MASK_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4210),
+ SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
+};
+
--- a/arch/arm/mach-exynos4/clock-exynos4212.c
+++ b/arch/arm/mach-exynos4/clock-exynos4212.c
+static struct sleep_save exynos4212_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
+};
+
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
+static struct sleep_save exynos4_clock_save[] = {
Hello,
Hi,
Is there any reason to have the following two
SAVE_ITEM(S5P_CLKSRC_IMAGE),
SAVE_ITEM(S5P_CLKDIV_IMAGE
defined at both clock-exynos4210.c and clock-exynos4212.c, not defined
at clock.c once?
Yes, I know. I just wanted to keep in mind there is a different
value(CLKGATE_IP_IMAGE) in regarding IMAGE clocks on each SoCs, and I think
need it now. Anyway thanks for your pointing out.
Also, consider using CONFIG_PM_SLEEP rather than CONFIG_PM for
suspend/resume ops.
(Cc'ed Rafael)
Well, even though CONFIG_PM_SLEEP is used in regarding syscore_ops, in this
case, using CONFIG_PM looks better.
If ARCH_SUSPEND_POSSIBLE will be selected, then CONFIG_SUSPEND is selected
and CONFIG_PM_SLEEP is selected in kernel/power/Kconfig and of course,
ARCH_SUSPEND_POSSIBLE is selected in arch/arm/Kconfig. However above
everything depends on CONFIG_PM. So I think to use CONFIG_PM is more
reasonable. In addition, it is more popular in other mainline codes now.
Hi Rafael,
How do you think about this?
If you make syscore_ops depend on CONFIG_PM, they will be built but not
used when CONFIG_PM_RUNTIME is set and CONFIG_PM_SLEEP is unset. If you
think that's acceptable, I guess you can do it (although you may get a
few defined but not used warnings in that case, which don't look nice).
Thanks,
Rafael
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] ARM: EXYNOS4: Add support PM for EXYNOS4212
On Wed, Aug 24, 2011 at 10:25 PM, Kukjin Kim kgene@samsung.com wrote:
From: Jonghwan Choi jhbird.c...@samsung.com
This patch moves regarding clock stuff of PM into clock
file to support PM on EXYNOS4210 and EXYNOS4212 with one
single kernel image. Because some clock registers are
different on each SoCs.
Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos4/clock-exynos4210.c | 38 ++
arch/arm/mach-exynos4/clock-exynos4212.c | 34 +
arch/arm/mach-exynos4/clock.c | 89
+++
arch/arm/mach-exynos4/include/mach/regs-clock.h | 4 +
arch/arm/mach-exynos4/pm.c | 79 ++--
5 files changed, 172 insertions(+), 72 deletions(-)
diff --git a/arch/arm/mach-exynos4/clock-exynos4210.c
b/arch/arm/mach-exynos4/clock-exynos4210.c
index fe74b91..a4b00b7 100644
--- a/arch/arm/mach-exynos4/clock-exynos4210.c
+++ b/arch/arm/mach-exynos4/clock-exynos4210.c
+static struct sleep_save exynos4210_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKSRC_LCD1),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_LCD1),
+ SAVE_ITEM(S5P_CLKSRC_MASK_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4210),
+ SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
+};
+
--- a/arch/arm/mach-exynos4/clock-exynos4212.c
+++ b/arch/arm/mach-exynos4/clock-exynos4212.c
+static struct sleep_save exynos4212_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
+};
+
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
+static struct sleep_save exynos4_clock_save[] = {
Hello,
Is there any reason to have the following two
SAVE_ITEM(S5P_CLKSRC_IMAGE),
SAVE_ITEM(S5P_CLKDIV_IMAGE
defined at both clock-exynos4210.c and clock-exynos4212.c, not defined
at clock.c once?
Also, consider using CONFIG_PM_SLEEP rather than CONFIG_PM for
suspend/resume ops.
Cheers!
MyungJoo
--
MyungJoo Ham, Ph.D.
Mobile Software Platform Lab, DMC Business, Samsung Electronics
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 3/5] ARM: EXYNOS4: Add support PM for EXYNOS4212
MyungJoo Ham wrote:
On Wed, Aug 24, 2011 at 10:25 PM, Kukjin Kim kgene@samsung.com
wrote:
From: Jonghwan Choi jhbird.c...@samsung.com
This patch moves regarding clock stuff of PM into clock
file to support PM on EXYNOS4210 and EXYNOS4212 with one
single kernel image. Because some clock registers are
different on each SoCs.
Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos4/clock-exynos4210.c | 38 ++
arch/arm/mach-exynos4/clock-exynos4212.c | 34 +
arch/arm/mach-exynos4/clock.c | 89
+++
arch/arm/mach-exynos4/include/mach/regs-clock.h | 4 +
arch/arm/mach-exynos4/pm.c | 79
++--
5 files changed, 172 insertions(+), 72 deletions(-)
diff --git a/arch/arm/mach-exynos4/clock-exynos4210.c b/arch/arm/mach-
exynos4/clock-exynos4210.c
index fe74b91..a4b00b7 100644
--- a/arch/arm/mach-exynos4/clock-exynos4210.c
+++ b/arch/arm/mach-exynos4/clock-exynos4210.c
+static struct sleep_save exynos4210_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKSRC_LCD1),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_LCD1),
+ SAVE_ITEM(S5P_CLKSRC_MASK_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4210),
+ SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
+};
+
--- a/arch/arm/mach-exynos4/clock-exynos4212.c
+++ b/arch/arm/mach-exynos4/clock-exynos4212.c
+static struct sleep_save exynos4212_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
+};
+
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
+static struct sleep_save exynos4_clock_save[] = {
Hello,
Hi,
Is there any reason to have the following two
SAVE_ITEM(S5P_CLKSRC_IMAGE),
SAVE_ITEM(S5P_CLKDIV_IMAGE
defined at both clock-exynos4210.c and clock-exynos4212.c, not defined
at clock.c once?
Yes, I know. I just wanted to keep in mind there is a different
value(CLKGATE_IP_IMAGE) in regarding IMAGE clocks on each SoCs, and I think
need it now. Anyway thanks for your pointing out.
Also, consider using CONFIG_PM_SLEEP rather than CONFIG_PM for
suspend/resume ops.
(Cc'ed Rafael)
Well, even though CONFIG_PM_SLEEP is used in regarding syscore_ops, in this
case, using CONFIG_PM looks better.
If ARCH_SUSPEND_POSSIBLE will be selected, then CONFIG_SUSPEND is selected
and CONFIG_PM_SLEEP is selected in kernel/power/Kconfig and of course,
ARCH_SUSPEND_POSSIBLE is selected in arch/arm/Kconfig. However above
everything depends on CONFIG_PM. So I think to use CONFIG_PM is more
reasonable. In addition, it is more popular in other mainline codes now.
Hi Rafael,
How do you think about this?
Its original code is below.
---
#ifdef CONFIG_PM
static int exynos4210_clock_suspend(void)
{
s3c_pm_do_save(exynos4210_clock_save,
ARRAY_SIZE(exynos4210_clock_save));
return 0;
}
static void exynos4210_clock_resume(void)
{
s3c_pm_do_restore_core(exynos4210_clock_save,
ARRAY_SIZE(exynos4210_clock_save));
}
#else
#define exynos4210_clock_suspend NULL
#define exynos4210_clock_resume NULL
#endif
struct syscore_ops exynos4210_clock_syscore_ops = {
.suspend= exynos4210_clock_suspend,
.resume = exynos4210_clock_resume,
};
---
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/5] ARM: EXYNOS4: Add support PM for EXYNOS4212
From: Jonghwan Choi jhbird.c...@samsung.com
This patch moves regarding clock stuff of PM into clock
file to support PM on EXYNOS4210 and EXYNOS4212 with one
single kernel image. Because some clock registers are
different on each SoCs.
Signed-off-by: Jonghwan Choi jhbird.c...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos4/clock-exynos4210.c| 38 ++
arch/arm/mach-exynos4/clock-exynos4212.c| 34 +
arch/arm/mach-exynos4/clock.c | 89 +++
arch/arm/mach-exynos4/include/mach/regs-clock.h |4 +
arch/arm/mach-exynos4/pm.c | 79 ++--
5 files changed, 172 insertions(+), 72 deletions(-)
diff --git a/arch/arm/mach-exynos4/clock-exynos4210.c
b/arch/arm/mach-exynos4/clock-exynos4210.c
index fe74b91..a4b00b7 100644
--- a/arch/arm/mach-exynos4/clock-exynos4210.c
+++ b/arch/arm/mach-exynos4/clock-exynos4210.c
@@ -15,6 +15,7 @@
#include linux/err.h
#include linux/clk.h
#include linux/io.h
+#include linux/syscore_ops.h
#include plat/cpu-freq.h
#include plat/clock.h
@@ -23,12 +24,24 @@
#include plat/s5p-clock.h
#include plat/clock-clksrc.h
#include plat/exynos4.h
+#include plat/pm.h
#include mach/hardware.h
#include mach/map.h
#include mach/regs-clock.h
#include mach/exynos4-clock.h
+static struct sleep_save exynos4210_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKSRC_LCD1),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_LCD1),
+ SAVE_ITEM(S5P_CLKSRC_MASK_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4210),
+ SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
+};
+
static struct clksrc_clk *sysclks[] = {
/* nothing here yet */
};
@@ -83,6 +96,29 @@ static struct clk init_clocks_off[] = {
},
};
+#ifdef CONFIG_PM
+static int exynos4210_clock_suspend(void)
+{
+ s3c_pm_do_save(exynos4210_clock_save,
ARRAY_SIZE(exynos4210_clock_save));
+
+ return 0;
+}
+
+static void exynos4210_clock_resume(void)
+{
+ s3c_pm_do_restore_core(exynos4210_clock_save,
ARRAY_SIZE(exynos4210_clock_save));
+}
+
+#else
+#define exynos4210_clock_suspend NULL
+#define exynos4210_clock_resume NULL
+#endif
+
+struct syscore_ops exynos4210_clock_syscore_ops = {
+ .suspend= exynos4210_clock_suspend,
+ .resume = exynos4210_clock_resume,
+};
+
void __init exynos4210_register_clocks(void)
{
int ptr;
@@ -98,4 +134,6 @@ void __init exynos4210_register_clocks(void)
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+
+ register_syscore_ops(exynos4210_clock_syscore_ops);
}
diff --git a/arch/arm/mach-exynos4/clock-exynos4212.c
b/arch/arm/mach-exynos4/clock-exynos4212.c
index 5a47a3f..4638a21 100644
--- a/arch/arm/mach-exynos4/clock-exynos4212.c
+++ b/arch/arm/mach-exynos4/clock-exynos4212.c
@@ -15,6 +15,7 @@
#include linux/err.h
#include linux/clk.h
#include linux/io.h
+#include linux/syscore_ops.h
#include plat/cpu-freq.h
#include plat/clock.h
@@ -23,12 +24,20 @@
#include plat/s5p-clock.h
#include plat/clock-clksrc.h
#include plat/exynos4.h
+#include plat/pm.h
#include mach/hardware.h
#include mach/map.h
#include mach/regs-clock.h
#include mach/exynos4-clock.h
+static struct sleep_save exynos4212_clock_save[] = {
+ SAVE_ITEM(S5P_CLKSRC_IMAGE),
+ SAVE_ITEM(S5P_CLKDIV_IMAGE),
+ SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
+ SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
+};
+
static struct clk *clk_src_mpll_user_list[] = {
[0] = clk_fin_mpll,
[1] = clk_mout_mpll.clk,
@@ -59,6 +68,29 @@ static struct clk init_clocks_off[] = {
/* nothing here yet */
};
+#ifdef CONFIG_PM
+static int exynos4212_clock_suspend(void)
+{
+ s3c_pm_do_save(exynos4212_clock_save,
ARRAY_SIZE(exynos4212_clock_save));
+
+ return 0;
+}
+
+static void exynos4212_clock_resume(void)
+{
+ s3c_pm_do_restore_core(exynos4212_clock_save,
ARRAY_SIZE(exynos4212_clock_save));
+}
+
+#else
+#define exynos4212_clock_suspend NULL
+#define exynos4212_clock_resume NULL
+#endif
+
+struct syscore_ops exynos4212_clock_syscore_ops = {
+ .suspend= exynos4212_clock_suspend,
+ .resume = exynos4212_clock_resume,
+};
+
void __init exynos4212_register_clocks(void)
{
int ptr;
@@ -81,4 +113,6 @@ void __init exynos4212_register_clocks(void)
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+
+ register_syscore_ops(exynos4212_clock_syscore_ops);
}
diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c
index eb99467..99c2a1f 100644
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@ -13,6 +13,7 @@
#include linux/kernel.h
