diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-10-04 01:43:02 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-10-04 01:43:02 +0200 |
| commit | a66993e05b6af0d981ba2cc9a529df63151942b5 (patch) | |
| tree | c5f664213a0397463d54a223faecd5bea19c368e /drivers/clk/mvebu/common.h | |
| parent | Revert "arm: pxa: Transition pxa27x to clk framework" (diff) | |
| parent | clk: mvebu: fix sscg node lookup (diff) | |
| download | linux-a66993e05b6af0d981ba2cc9a529df63151942b5.tar.xz linux-a66993e05b6af0d981ba2cc9a529df63151942b5.zip | |
Merge tag 'clk-mvebu-3.18-2' of git://git.infradead.org/linux-mvebu into clk-next
clock mvebu changes for v3.18 (round 2)
- armada 370/375
- Fix SSCG node lookup
Diffstat (limited to 'drivers/clk/mvebu/common.h')
| -rw-r--r-- | drivers/clk/mvebu/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mvebu/common.h b/drivers/clk/mvebu/common.h index 8f8db7eac3f6..783b5631a453 100644 --- a/drivers/clk/mvebu/common.h +++ b/drivers/clk/mvebu/common.h @@ -31,7 +31,7 @@ struct coreclk_soc_desc { 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); + u32 (*fix_sscg_deviation)(u32 system_clk); const struct coreclk_ratio *ratios; int num_ratios; }; @@ -53,5 +53,5 @@ void __init mvebu_clk_gating_setup(struct device_node *np, * 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); +u32 kirkwood_fix_sscg_deviation(u32 system_clk); #endif |