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

Commit d7a81d84 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Stephen Boyd
Browse files

clk: at91: Revert "keep slow clk enabled to prevent system hang" 



Commit dca1a4b5 ("clk: at91: keep slow clk enabled to prevent system
hang") added a workaround for the slow clock as it is not properly handled
by its users.

Now that the slow clock is taken properly by the drivers, this workaround
is not necessary anymore, revert it.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarMichael Turquette <mturquette@baylibre.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 1382ea63

drivers/clk/at91/clk-slow.c

+0 −29
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *

 */



#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/slab.h>
@@ -72,8 +71,6 @@ struct clk_sam9x5_slow { 


#define to_clk_sam9x5_slow(hw) container_of(hw, struct clk_sam9x5_slow, hw)



static struct clk *slow_clk;



static int clk_slow_osc_prepare(struct clk_hw *hw)

{

	struct clk_slow_osc *osc = to_clk_slow_osc(hw);
@@ -360,8 +357,6 @@ at91_clk_register_sam9x5_slow(void __iomem *sckcr, 
	clk = clk_register(NULL, &slowck->hw);

	if (IS_ERR(clk))

		kfree(slowck);

	else

		slow_clk = clk;



	return clk;

}
@@ -433,8 +428,6 @@ at91_clk_register_sam9260_slow(struct at91_pmc *pmc, 
	clk = clk_register(NULL, &slowck->hw);

	if (IS_ERR(clk))

		kfree(slowck);

	else

		slow_clk = clk;



	return clk;

}
@@ -462,25 +455,3 @@ void __init of_at91sam9260_clk_slow_setup(struct device_node *np, 


	of_clk_add_provider(np, of_clk_src_simple_get, clk);

}
 


/*

 * FIXME: All slow clk users are not properly claiming it (get + prepare +

 * enable) before using it.

 * If all users properly claiming this clock decide that they don't need it

 * anymore (or are removed), it is disabled while faulty users are still

 * requiring it, and the system hangs.

 * Prevent this clock from being disabled until all users are properly

 * requesting it.

 * Once this is done we should remove this function and the slow_clk variable.

 */

static int __init of_at91_clk_slow_retain(void)

{

	if (!slow_clk)

		return 0;



	__clk_get(slow_clk);

	clk_prepare_enable(slow_clk);



	return 0;

}

arch_initcall(of_at91_clk_slow_retain);