p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Hans de Goede 2014-05-12 14:04:47 +02:00 committed by Mike Turquette
parent 8a5f93faa5
commit a97181adf1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/clk/sunxi/clk-sunxi.c
View File

@ -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);

2
include/linux/clk/sunxi.h
View File

@ -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