clk: samsung: Drop old suspend/resume code

Since all SoC drivers have been moved to local suspend/resume handling,
the old code can be safely dropped.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Thomas Abraham <thomas.ab@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index 325f29248af55331e13b8a13aff401423264a56f..b620a8375b7f0a4bacd8d5ab441bc5610da2d1d3 100644 (file)
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -1122,7 +1122,7 @@ static void __init exynos4_clk_init(struct device_node *np,
        if (!reg_base)
                panic("%s: failed to map registers\n", __func__);
 
-       samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0);
+       samsung_clk_init(np, reg_base, CLK_NR_CLKS);
 
        samsung_clk_of_register_fixed_ext(exynos4_fixed_rate_ext_clks,
                        ARRAY_SIZE(exynos4_fixed_rate_ext_clks),

diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index b3cccf044607056f3212edb51d621737479c54a5..e7ee4420da8178fd5a55525b9d994f37fcb7895a 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -694,7 +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, NULL, 0, NULL, 0);
+       samsung_clk_init(np, reg_base, CLK_NR_CLKS);
        samsung_clk_of_register_fixed_ext(exynos5250_fixed_rate_ext_clks,
                        ARRAY_SIZE(exynos5250_fixed_rate_ext_clks),
                        ext_clk_match);

diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 8ce078049fb403c693c83ab50fd027dcce7d748a..60b26819bed51691b6d5f2c4c5c2d10521f9b4d3 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -786,7 +786,7 @@ static void __init exynos5420_clk_init(struct device_node *np)
                panic("%s: unable to determine soc\n", __func__);
        }
 
-       samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0);
+       samsung_clk_init(np, reg_base, CLK_NR_CLKS);
        samsung_clk_of_register_fixed_ext(exynos5420_fixed_rate_ext_clks,
                        ARRAY_SIZE(exynos5420_fixed_rate_ext_clks),
                        ext_clk_match);

diff --git a/drivers/clk/samsung/clk-exynos5440.c b/drivers/clk/samsung/clk-exynos5440.c
index cbc15b56891d75740cb149c03e91a28f10b09f60..2bfad5a993d01fb247dec96c0c052137998435c2 100644 (file)
--- a/drivers/clk/samsung/clk-exynos5440.c
+++ b/drivers/clk/samsung/clk-exynos5440.c
@@ -101,7 +101,7 @@ static void __init exynos5440_clk_init(struct device_node *np)
                return;
        }
 
-       samsung_clk_init(np, reg_base, CLK_NR_CLKS, NULL, 0, NULL, 0);
+       samsung_clk_init(np, reg_base, CLK_NR_CLKS);
        samsung_clk_of_register_fixed_ext(exynos5440_fixed_rate_ext_clks,
                ARRAY_SIZE(exynos5440_fixed_rate_ext_clks), ext_clk_match);
 

diff --git a/drivers/clk/samsung/clk-s3c64xx.c b/drivers/clk/samsung/clk-s3c64xx.c
index d3fbfa56697429f873a3c9d1e2a050c78fda0277..8bda658137a8ced3ecf8090db65fedb91625ed2f 100644 (file)
--- a/drivers/clk/samsung/clk-s3c64xx.c
+++ b/drivers/clk/samsung/clk-s3c64xx.c
@@ -465,7 +465,7 @@ void __init s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
                        panic("%s: failed to map registers\n", __func__);
        }
 
-       samsung_clk_init(np, reg_base, NR_CLKS, NULL, 0, NULL, 0);
+       samsung_clk_init(np, reg_base, NR_CLKS);
 
        /* Register external clocks. */
        if (!np)

diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index ec761e344fd078cad69d263c9f668826605bb065..91bec3ebdc8fba0306ee9b7e91d72f2fa433cf4a 100644 (file)
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -21,7 +21,6 @@ static void __iomem *reg_base;
 static struct clk_onecell_data clk_data;
 #endif
 
-#ifdef CONFIG_PM_SLEEP
 void samsung_clk_save(void __iomem *base,
                                    struct samsung_clk_reg_dump *rd,
                                    unsigned int num_regs)
@@ -55,63 +54,12 @@ struct samsung_clk_reg_dump *samsung_clk_alloc_reg_dump(
        return rd;
 }
 
-static struct samsung_clk_reg_dump *reg_dump;
-static unsigned long nr_reg_dump;
-
-static int samsung_clk_suspend(void)
-{
-       struct samsung_clk_reg_dump *rd = reg_dump;
-       unsigned long i;
-
-       for (i = 0; i < nr_reg_dump; i++, rd++)
-               rd->value = __raw_readl(reg_base + rd->offset);
-
-       return 0;
-}
-
-static void samsung_clk_resume(void)
-{
-       struct samsung_clk_reg_dump *rd = reg_dump;
-       unsigned long i;
-
-       for (i = 0; i < nr_reg_dump; i++, rd++)
-               __raw_writel(rd->value, reg_base + rd->offset);
-}
-
-static struct syscore_ops samsung_clk_syscore_ops = {
-       .suspend        = samsung_clk_suspend,
-       .resume         = samsung_clk_resume,
-};
-#endif /* CONFIG_PM_SLEEP */
-
 /* setup the essentials required to support clock lookup using ccf */
 void __init samsung_clk_init(struct device_node *np, void __iomem *base,
-               unsigned long nr_clks, unsigned long *rdump,
-               unsigned long nr_rdump, unsigned long *soc_rdump,
-               unsigned long nr_soc_rdump)
+                            unsigned long nr_clks)
 {
        reg_base = base;
 
-#ifdef CONFIG_PM_SLEEP
-       if (rdump && nr_rdump) {
-               unsigned int idx;
-               reg_dump = kzalloc(sizeof(struct samsung_clk_reg_dump)
-                               * (nr_rdump + nr_soc_rdump), GFP_KERNEL);
-               if (!reg_dump) {
-                       pr_err("%s: memory alloc for register dump failed\n",
-                                       __func__);
-                       return;
-               }
-
-               for (idx = 0; idx < nr_rdump; idx++)
-                       reg_dump[idx].offset = rdump[idx];
-               for (idx = 0; idx < nr_soc_rdump; idx++)
-                       reg_dump[nr_rdump + idx].offset = soc_rdump[idx];
-               nr_reg_dump = nr_rdump + nr_soc_rdump;
-               register_syscore_ops(&samsung_clk_syscore_ops);
-       }
-#endif
-
        clk_table = kzalloc(sizeof(struct clk *) * nr_clks, GFP_KERNEL);
        if (!clk_table)
                panic("could not allocate clock lookup table\n");

diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
index 93cb8a0deb7b594345983c4f32968c6c0ce90625..c7141ba826e0c9100b9860bdfe718f358e83d887 100644 (file)
--- a/drivers/clk/samsung/clk.h
+++ b/drivers/clk/samsung/clk.h
@@ -313,9 +313,7 @@ struct samsung_pll_clock {
                _lock, _con, _rtable, _alias)
 
 extern void __init samsung_clk_init(struct device_node *np, void __iomem *base,
-               unsigned long nr_clks, unsigned long *rdump,
-               unsigned long nr_rdump, unsigned long *soc_rdump,
-               unsigned long nr_soc_rdump);
+                                   unsigned long nr_clks);
 extern void __init samsung_clk_of_register_fixed_ext(
                struct samsung_fixed_rate_clock *fixed_rate_clk,
                unsigned int nr_fixed_rate_clk,