clk: samsung: s3c2443: Use generic helper for handling suspend/resume
Replace common suspend/resume handling code by generic helper. Almost no functional change, the only difference is in handling of hypothetical memory allocation failure on boot. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sylwester Nawrocki <snawrocki@kernel.org>
This commit is contained in:
parent
1b3493d755
commit
b5331e2fea
|
@ -11,7 +11,6 @@
|
||||||
#include <linux/clk-provider.h>
|
#include <linux/clk-provider.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
#include <linux/syscore_ops.h>
|
|
||||||
#include <linux/reboot.h>
|
#include <linux/reboot.h>
|
||||||
|
|
||||||
#include <dt-bindings/clock/s3c2443.h>
|
#include <dt-bindings/clock/s3c2443.h>
|
||||||
|
@ -43,9 +42,6 @@ enum supported_socs {
|
||||||
|
|
||||||
static void __iomem *reg_base;
|
static void __iomem *reg_base;
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
|
||||||
static struct samsung_clk_reg_dump *s3c2443_save;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* list of controller registers to be saved and restored during a
|
* list of controller registers to be saved and restored during a
|
||||||
* suspend/resume cycle.
|
* suspend/resume cycle.
|
||||||
|
@ -65,42 +61,6 @@ static unsigned long s3c2443_clk_regs[] __initdata = {
|
||||||
SCLKCON,
|
SCLKCON,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int s3c2443_clk_suspend(void)
|
|
||||||
{
|
|
||||||
samsung_clk_save(reg_base, s3c2443_save,
|
|
||||||
ARRAY_SIZE(s3c2443_clk_regs));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void s3c2443_clk_resume(void)
|
|
||||||
{
|
|
||||||
samsung_clk_restore(reg_base, s3c2443_save,
|
|
||||||
ARRAY_SIZE(s3c2443_clk_regs));
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct syscore_ops s3c2443_clk_syscore_ops = {
|
|
||||||
.suspend = s3c2443_clk_suspend,
|
|
||||||
.resume = s3c2443_clk_resume,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void __init s3c2443_clk_sleep_init(void)
|
|
||||||
{
|
|
||||||
s3c2443_save = samsung_clk_alloc_reg_dump(s3c2443_clk_regs,
|
|
||||||
ARRAY_SIZE(s3c2443_clk_regs));
|
|
||||||
if (!s3c2443_save) {
|
|
||||||
pr_warn("%s: failed to allocate sleep save data, no sleep support!\n",
|
|
||||||
__func__);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
register_syscore_ops(&s3c2443_clk_syscore_ops);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
static void __init s3c2443_clk_sleep_init(void) {}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
PNAME(epllref_p) = { "mpllref", "mpllref", "xti", "ext" };
|
PNAME(epllref_p) = { "mpllref", "mpllref", "xti", "ext" };
|
||||||
PNAME(esysclk_p) = { "epllref", "epll" };
|
PNAME(esysclk_p) = { "epllref", "epll" };
|
||||||
PNAME(mpllref_p) = { "xti", "mdivclk" };
|
PNAME(mpllref_p) = { "xti", "mdivclk" };
|
||||||
|
@ -450,7 +410,8 @@ void __init s3c2443_common_clk_init(struct device_node *np, unsigned long xti_f,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
s3c2443_clk_sleep_init();
|
samsung_clk_sleep_init(reg_base, s3c2443_clk_regs,
|
||||||
|
ARRAY_SIZE(s3c2443_clk_regs));
|
||||||
|
|
||||||
samsung_clk_of_add_provider(np, ctx);
|
samsung_clk_of_add_provider(np, ctx);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue