From: Mike Turquette <mturquette@linaro.org>
Date: Sat, 27 Sep 2014 19:52:33 +0000 (-0700)
Subject: Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3030^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4dc7ed32f398fa76b9e1d243a852420b1dad0150;p=firefly-linux-kernel-4.4.55.git

Merge tag 'sunxi-clocks-for-3.18' of git://git./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.
---

4dc7ed32f398fa76b9e1d243a852420b1dad0150
diff --cc include/linux/clk-private.h
index 4ed34105c371,845be30be50f..0ca5f6046920
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@@ -46,9 -46,9 +46,10 @@@ 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;
  	unsigned int		notifier_count;
  #ifdef CONFIG_DEBUG_FS
  	struct dentry		*dentry;