UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'clk-sunxi' into clk-next 

* clk-sunxi:
  clk: sunxi: explicitly request exclusive reset control
  clk: sunxi: fix build warning
This commit is contained in:
Stephen Boyd 2017-11-14 10:07:37 -08:00
parent bdf6bfb378 cb92a19b99
commit 3b0da91688
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/sunxi/clk-factors.c
View File

@ -276,13 +276,11 @@ void sunxi_factors_unregister(struct device_node *node, struct clk *clk)
{ {
struct clk_hw *hw = __clk_get_hw(clk); struct clk_hw *hw = __clk_get_hw(clk);
struct clk_factors *factors; struct clk_factors *factors;
const char *name;
if (!hw) if (!hw)
return; return;
factors = to_clk_factors(hw); factors = to_clk_factors(hw);
name = clk_hw_get_name(hw);
of_clk_del_provider(node); of_clk_del_provider(node);
/* TODO: The composite clock stuff will leak a bit here. */ /* TODO: The composite clock stuff will leak a bit here. */

2
drivers/clk/sunxi/clk-sun9i-mmc.c
View File

@ -124,7 +124,7 @@ static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev)
return PTR_ERR(data->clk); return PTR_ERR(data->clk);
} }
data->reset = devm_reset_control_get(&pdev->dev, NULL); data->reset = devm_reset_control_get_exclusive(&pdev->dev, NULL);
if (IS_ERR(data->reset)) { if (IS_ERR(data->reset)) {
dev_err(&pdev->dev, "Could not get reset control\n"); dev_err(&pdev->dev, "Could not get reset control\n");
return PTR_ERR(data->reset); return PTR_ERR(data->reset);