1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
index aa872d2c5105..da3bdebabf1e 100644
--- a/drivers/clk/samsung/clk.h
+++ b/drivers/clk/samsung/clk.h
@@ -261,7 +261,7 @@ struct samsung_gate_clock {
 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a)       \
         __GATE(_id, dname, cname, pname, o, b, f, gf, a)
 
-#define PNAME(x) static const char *x[] __initdata
+#define PNAME(x) static const char * const x[] __initconst
 
 /**
  * struct samsung_clk_reg_dump: register dump of clock controller registers.
@@ -330,28 +330,28 @@ struct samsung_clock_reg_cache {
 
 struct samsung_cmu_info {
         /* list of pll clocks and respective count */
-        struct samsung_pll_clock *pll_clks;
+        const struct samsung_pll_clock *pll_clks;
         unsigned int nr_pll_clks;
         /* list of mux clocks and respective count */
-        struct samsung_mux_clock *mux_clks;
+        const struct samsung_mux_clock *mux_clks;
         unsigned int nr_mux_clks;
         /* list of div clocks and respective count */
-        struct samsung_div_clock *div_clks;
+        const struct samsung_div_clock *div_clks;
         unsigned int nr_div_clks;
         /* list of gate clocks and respective count */
-        struct samsung_gate_clock *gate_clks;
+        const struct samsung_gate_clock *gate_clks;
         unsigned int nr_gate_clks;
         /* list of fixed clocks and respective count */
-        struct samsung_fixed_rate_clock *fixed_clks;
+        const struct samsung_fixed_rate_clock *fixed_clks;
         unsigned int nr_fixed_clks;
         /* list of fixed factor clocks and respective count */
-        struct samsung_fixed_factor_clock *fixed_factor_clks;
+        const struct samsung_fixed_factor_clock *fixed_factor_clks;
         unsigned int nr_fixed_factor_clks;
         /* total number of clocks with IDs assigned*/
         unsigned int nr_clk_ids;
 
         /* list and number of clocks registers */
-        unsigned long *clk_regs;
+        const unsigned long *clk_regs;
         unsigned int nr_clk_regs;
 };
 
@@ -395,10 +395,14 @@ extern void __init samsung_clk_register_pll(struct samsung_clk_provider *ctx,
 
 extern struct samsung_clk_provider __init *samsung_cmu_register_one(
                         struct device_node *,
-                        struct samsung_cmu_info *);
+                        const struct samsung_cmu_info *);
 
 extern unsigned long _get_rate(const char *clk_name);
 
+extern void samsung_clk_sleep_init(void __iomem *reg_base,
+                        const unsigned long *rdump,
+                        unsigned long nr_rdump);
+
 extern void samsung_clk_save(void __iomem *base,
                         struct samsung_clk_reg_dump *rd,
                         unsigned int num_regs);