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>

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 59f90401b9000ac9e4b6e9070efd7e0a45a75c94..4cc2b2a5aa752241de24487ec8c446ca2ceefda0 100644 (file)
--- 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);

diff --git a/include/linux/clk/sunxi.h b/include/linux/clk/sunxi.h
index 1ef5c899e458038c03884551de7d7b0cf3daeec7..aed28c4451d9601b63a80b84d4e48f0d10e33d7d 100644 (file)
--- a/include/linux/clk/sunxi.h
+++ b/include/linux/clk/sunxi.h
@@ -17,6 +17,6 @@
 
 #include <linux/clk.h>
 
-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);
 
 #endif