diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-27 12:52:33 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-27 12:52:33 -0700 |
| commit | 4dc7ed32f398fa76b9e1d243a852420b1dad0150 (patch) | |
| tree | a040f8c006ea7a7a3c962f135c8efd8b72cbc4b4 /include/linux/clk-private.h | |
| parent | 5ad67d3e5e0a5059945a7726a407763a23f80d9e (diff) | |
| parent | 9c8176bfb67f98ed9a521b624dcb6ab7fa254aa7 (diff) | |
Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner Clocks Additions for 3.18
The most important part of this serie is the addition of the phase API to
handle the MMC clocks in the Allwinner SoCs.
Apart from that, the A23 gained a new mbus driver, and there's a fix for a
incorrect divider table on the APB0 clock.
Diffstat (limited to 'include/linux/clk-private.h')
| -rw-r--r-- | include/linux/clk-private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h index 4ed34105c371..0ca5f6046920 100644 --- a/include/linux/clk-private.h +++ b/include/linux/clk-private.h @@ -46,6 +46,7 @@ struct clk { unsigned int enable_count; unsigned int prepare_count; unsigned long accuracy; + int phase; struct hlist_head children; struct hlist_node child_node; struct hlist_node debug_node; |