diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-26 17:04:08 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-26 17:04:08 -0700 |
| commit | 8791db53a9d2556b8908af300d8327eecb110d8a (patch) | |
| tree | 760ae9de15ea3f642e55824dd7be1b4bef9bd6a1 /drivers/clk/mvebu/common.h | |
| parent | c873d14d30b838a516a94967242322d4b73e79e7 (diff) | |
| parent | ceac26c64200015a5e6e358e903b1ca9a6f41dd8 (diff) | |
Merge tag 'clk-mvebu-3.18' of git://git.infradead.org/linux-mvebu into clk-next
clock changes for mvebu for v3.18
- correct timer drift caused by SSCG deviation
- fix typo in comment
Diffstat (limited to 'drivers/clk/mvebu/common.h')
| -rw-r--r-- | drivers/clk/mvebu/common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/clk/mvebu/common.h b/drivers/clk/mvebu/common.h index 8cd28e47471c..8f8db7eac3f6 100644 --- a/drivers/clk/mvebu/common.h +++ b/drivers/clk/mvebu/common.h @@ -30,6 +30,8 @@ struct coreclk_soc_desc { u32 (*get_tclk_freq)(void __iomem *sar); u32 (*get_cpu_freq)(void __iomem *sar); void (*get_clk_ratio)(void __iomem *sar, int id, int *mult, int *div); + bool (*is_sscg_enabled)(void __iomem *sar); + u32 (*fix_sscg_deviation)(struct device_node *np, u32 system_clk); const struct coreclk_ratio *ratios; int num_ratios; }; @@ -47,4 +49,9 @@ void __init mvebu_coreclk_setup(struct device_node *np, void __init mvebu_clk_gating_setup(struct device_node *np, const struct clk_gating_soc_desc *desc); +/* + * This function is shared among the Kirkwood, Armada 370, Armada XP + * and Armada 375 SoC + */ +u32 kirkwood_fix_sscg_deviation(struct device_node *np, u32 system_clk); #endif |