Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / bcm / clk-kona.h

diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h
index 906576ec97b6f9176fa6e0cfe6390e2856dcfc06..f4b39bb5558a7483ecc341a1628503f7ab0b0c51 100644 (file)
--- a/drivers/clk/bcm/clk-kona.h
+++ b/drivers/clk/bcm/clk-kona.h
@@ -481,7 +481,7 @@ struct ccu_data {
        bool write_enabled;     /* write access is currently enabled */
        struct ccu_policy policy;
        struct device_node *node;
-       struct clk_onecell_data clk_data;
+       size_t clk_num;
        const char *name;
        u32 range;              /* byte range of address space */
        struct kona_clk kona_clks[];    /* must be last */
@@ -491,9 +491,7 @@ struct ccu_data {
 #define KONA_CCU_COMMON(_prefix, _name, _ccuname)                          \
        .name           = #_name "_ccu",                                    \
        .lock           = __SPIN_LOCK_UNLOCKED(_name ## _ccu_data.lock),    \
-       .clk_data       = {                                                 \
-               .clk_num = _prefix ## _ ## _ccuname ## _CCU_CLOCK_COUNT,    \
-       }
+       .clk_num        = _prefix ## _ ## _ccuname ## _CCU_CLOCK_COUNT
 
 /* Exported globals */
 
@@ -505,7 +503,6 @@ extern u64 scaled_div_max(struct bcm_clk_div *div);
 extern u64 scaled_div_build(struct bcm_clk_div *div, u32 div_value,
                                u32 billionths);
 
-extern struct clk *kona_clk_setup(struct kona_clk *bcm_clk);
 extern void __init kona_dt_ccu_setup(struct ccu_data *ccu,
                                struct device_node *node);
 extern bool __init kona_ccu_init(struct ccu_data *ccu);