diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-05-12 14:04:47 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-05-15 01:58:21 +0200 |
| commit | a97181adf1502128e2945b4fef2591249c565467 (patch) | |
| tree | 61827ef1fbe7b116d69053a801bbb9cd61406a4f /drivers/clk/sunxi | |
| parent | Merge tag 'clk-mvebu-3.16' of git://git.infradead.org/linux-mvebu into clk-ne... (diff) | |
| download | linux-a97181adf1502128e2945b4fef2591249c565467.tar.xz linux-a97181adf1502128e2945b4fef2591249c565467.zip | |
clk: sunxi: Fixup clk_sunxi_mmc_phase_control to take a clk rather then a hw_clk
__clk_get_hw is supposed to be used by clk providers, not clk consumers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/sunxi')
| -rw-r--r-- | drivers/clk/sunxi/clk-sunxi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 59f90401b900..4cc2b2a5aa75 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -510,11 +510,12 @@ CLK_OF_DECLARE(sun7i_a20_gmac, "allwinner,sun7i-a20-gmac-clk", * clk_sunxi_mmc_phase_control() - configures MMC clock phase control */ -void clk_sunxi_mmc_phase_control(struct clk_hw *hw, u8 sample, u8 output) +void clk_sunxi_mmc_phase_control(struct clk *clk, u8 sample, u8 output) { #define to_clk_composite(_hw) container_of(_hw, struct clk_composite, hw) #define to_clk_factors(_hw) container_of(_hw, struct clk_factors, hw) + struct clk_hw *hw = __clk_get_hw(clk); struct clk_composite *composite = to_clk_composite(hw); struct clk_hw *rate_hw = composite->rate_hw; struct clk_factors *factors = to_clk_factors(rate_hw); |