Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b6c1d7 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

clk: samsung: exynos5250: Move suspend/resume handling to SoC driver 



Since there are multiple differences in how suspend/resume of particular
Exynos SoCs must be handled, SoC driver is better place for
suspend/resume handlers and so this patch moves them.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarThomas Abraham <thomas.ab@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b7b647be

drivers/clk/samsung/clk-exynos5250.c

+44 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/clk-provider.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/syscore_ops.h>



#include "clk.h"
@@ -85,6 +86,11 @@ enum exynos5250_plls { 
	nr_plls			/* number of PLLs */

};



static void __iomem *reg_base;



#ifdef CONFIG_PM_SLEEP

static struct samsung_clk_reg_dump *exynos5250_save;



/*

 * list of controller registers to be saved and restored during a

 * suspend/resume cycle.
@@ -137,6 +143,41 @@ static unsigned long exynos5250_clk_regs[] __initdata = { 
	GATE_IP_ACP,

};



static int exynos5250_clk_suspend(void)

{

	samsung_clk_save(reg_base, exynos5250_save,

				ARRAY_SIZE(exynos5250_clk_regs));



	return 0;

}



static void exynos5250_clk_resume(void)

{

	samsung_clk_restore(reg_base, exynos5250_save,

				ARRAY_SIZE(exynos5250_clk_regs));

}



static struct syscore_ops exynos5250_clk_syscore_ops = {

	.suspend = exynos5250_clk_suspend,

	.resume = exynos5250_clk_resume,

};



static void exynos5250_clk_sleep_init(void)

{

	exynos5250_save = samsung_clk_alloc_reg_dump(exynos5250_clk_regs,

					ARRAY_SIZE(exynos5250_clk_regs));

	if (!exynos5250_save) {

		pr_warn("%s: failed to allocate sleep save data, no sleep support!\n",

			__func__);

		return;

	}



	register_syscore_ops(&exynos5250_clk_syscore_ops);

}

#else

static void exynos5250_clk_sleep_init(void) {}

#endif



/* list of all parent clock list */

PNAME(mout_apll_p)	= { "fin_pll", "fout_apll", };

PNAME(mout_cpu_p)	= { "mout_apll", "mout_mpll", };
@@ -645,8 +686,6 @@ static struct of_device_id ext_clk_match[] __initdata = { 
/* register exynox5250 clocks */

static void __init exynos5250_clk_init(struct device_node *np)

{

	void __iomem *reg_base;



	if (np) {

		reg_base = of_iomap(np, 0);

		if (!reg_base)
@@ -655,9 +694,7 @@ static void __init exynos5250_clk_init(struct device_node *np) 
		panic("%s: unable to determine soc\n", __func__);

	}



	samsung_clk_init(np, reg_base, CLK_NR_CLKS,

			exynos5250_clk_regs, ARRAY_SIZE(exynos5250_clk_regs),

			NULL, 0);

	samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0);

	samsung_clk_of_register_fixed_ext(exynos5250_fixed_rate_ext_clks,

			ARRAY_SIZE(exynos5250_fixed_rate_ext_clks),

			ext_clk_match);
@@ -685,6 +722,8 @@ static void __init exynos5250_clk_init(struct device_node *np) 
	samsung_clk_register_gate(exynos5250_gate_clks,

			ARRAY_SIZE(exynos5250_gate_clks));



	exynos5250_clk_sleep_init();



	pr_info("Exynos5250: clock setup completed, armclk=%ld\n",

			_get_rate("div_arm2"));

}

drivers/clk/samsung/clk.c

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ void samsung_clk_restore(void __iomem *base, 
		writel(rd->value, base + rd->offset);

}



struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(unsigned long *rdump,

struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(

						const unsigned long *rdump,

						unsigned long nr_rdump)

{

	struct samsung_clk_reg_dump *rd;

drivers/clk/samsung/clk.h

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ extern void samsung_clk_restore(void __iomem *base, 
				const struct samsung_clk_reg_dump *rd,

				unsigned int num_regs);

extern struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(

							unsigned long *rdump,

						const unsigned long *rdump,

						unsigned long nr_rdump);



#endif /* __SAMSUNG_CLK_H */