Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b0da916 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-sunxi' into clk-next 

* clk-sunxi:
  clk: sunxi: explicitly request exclusive reset control
  clk: sunxi: fix build warning
parents bdf6bfb3 cb92a19b

drivers/clk/sunxi/clk-factors.c

+0 −2
Original line number Diff line number Diff line
@@ -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_factors *factors;

	const char *name;



	if (!hw)

		return;



	factors = to_clk_factors(hw);

	name = clk_hw_get_name(hw);



	of_clk_del_provider(node);

	/* TODO: The composite clock stuff will leak a bit here. */

drivers/clk/sunxi/clk-sun9i-mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev) 
		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)) {

		dev_err(&pdev->dev, "Could not get reset control\n");

		return PTR_ERR(data->reset);