clk: ti: autoidle: move generic autoidle handling code to clock driver (bf22bae7) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/mach-omap2/clock.c

+0 −104

Original line number	Diff line number	Diff line
		@@ -69,8 +69,6 @@ u16 cpu_mask;
		*/
		static bool clkdm_control = true;

		static LIST_HEAD(clk_hw_omap_clocks);

		struct clk_iomap {
		struct regmap *regmap;
		void __iomem *mem;
		@@ -578,108 +576,6 @@ static int __init omap_clk_setup(char *str)
		}
		__setup("mpurate=", omap_clk_setup);

		/**
		* omap2_init_clk_hw_omap_clocks - initialize an OMAP clock
		* @clk: struct clk * to initialize
		*
		* Add an OMAP clock @clk to the internal list of OMAP clocks. Used
		* temporarily for autoidle handling, until this support can be
		* integrated into the common clock framework code in some way. No
		* return value.
		*/
		void omap2_init_clk_hw_omap_clocks(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		list_add(&c->node, &clk_hw_omap_clocks);
		}

		/**
		* omap2_clk_enable_autoidle_all - enable autoidle on all OMAP clocks that
		* support it
		*
		* Enable clock autoidle on all OMAP clocks that have allow_idle
		* function pointers associated with them. This function is intended
		* to be temporary until support for this is added to the common clock
		* code. Returns 0.
		*/
		int omap2_clk_enable_autoidle_all(void)
		{
		struct clk_hw_omap *c;

		list_for_each_entry(c, &clk_hw_omap_clocks, node)
		if (c->ops && c->ops->allow_idle)
		c->ops->allow_idle(c);

		of_ti_clk_allow_autoidle_all();

		return 0;
		}

		/**
		* omap2_clk_disable_autoidle_all - disable autoidle on all OMAP clocks that
		* support it
		*
		* Disable clock autoidle on all OMAP clocks that have allow_idle
		* function pointers associated with them. This function is intended
		* to be temporary until support for this is added to the common clock
		* code. Returns 0.
		*/
		int omap2_clk_disable_autoidle_all(void)
		{
		struct clk_hw_omap *c;

		list_for_each_entry(c, &clk_hw_omap_clocks, node)
		if (c->ops && c->ops->deny_idle)
		c->ops->deny_idle(c);

		of_ti_clk_deny_autoidle_all();

		return 0;
		}

		/**
		* omap2_clk_deny_idle - disable autoidle on an OMAP clock
		* @clk: struct clk * to disable autoidle for
		*
		* Disable autoidle on an OMAP clock.
		*/
		int omap2_clk_deny_idle(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return -EINVAL;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		if (c->ops && c->ops->deny_idle)
		c->ops->deny_idle(c);
		return 0;
		}

		/**
		* omap2_clk_allow_idle - enable autoidle on an OMAP clock
		* @clk: struct clk * to enable autoidle for
		*
		* Enable autoidle on an OMAP clock.
		*/
		int omap2_clk_allow_idle(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return -EINVAL;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		if (c->ops && c->ops->allow_idle)
		c->ops->allow_idle(c);
		return 0;
		}

		/**
		* omap2_clk_enable_init_clocks - prepare & enable a list of clocks
		* @clk_names: ptr to an array of strings of clock names to enable

arch/arm/mach-omap2/clock.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -186,9 +186,6 @@ void omap3_dpll_deny_idle(struct clk_hw_omap *clk);

		void __init omap2_clk_disable_clkdm_control(void);

		int omap2_clk_enable_autoidle_all(void);
		int omap2_clk_allow_idle(struct clk *clk);
		int omap2_clk_deny_idle(struct clk *clk);
		int omap2_clk_switch_mpurate_at_boot(const char *mpurate_ck_name);
		void omap2_clk_print_new_rates(const char *hfclkin_ck_name,
		const char *core_ck_name,

drivers/clk/ti/autoidle.c

+111 −8

Original line number	Diff line number	Diff line
		@@ -33,8 +33,47 @@ struct clk_ti_autoidle {
		#define AUTOIDLE_LOW 0x1

		static LIST_HEAD(autoidle_clks);
		static LIST_HEAD(clk_hw_omap_clocks);

		static void ti_allow_autoidle(struct clk_ti_autoidle *clk)
		/**
		* omap2_clk_deny_idle - disable autoidle on an OMAP clock
		* @clk: struct clk * to disable autoidle for
		*
		* Disable autoidle on an OMAP clock.
		*/
		int omap2_clk_deny_idle(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return -EINVAL;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		if (c->ops && c->ops->deny_idle)
		c->ops->deny_idle(c);
		return 0;
		}

		/**
		* omap2_clk_allow_idle - enable autoidle on an OMAP clock
		* @clk: struct clk * to enable autoidle for
		*
		* Enable autoidle on an OMAP clock.
		*/
		int omap2_clk_allow_idle(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return -EINVAL;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		if (c->ops && c->ops->allow_idle)
		c->ops->allow_idle(c);
		return 0;
		}

		static void _allow_autoidle(struct clk_ti_autoidle *clk)
		{
		u32 val;

		@@ -48,7 +87,7 @@ static void ti_allow_autoidle(struct clk_ti_autoidle *clk)
		ti_clk_ll_ops->clk_writel(val, clk->reg);
		}

		static void ti_deny_autoidle(struct clk_ti_autoidle *clk)
		static void _deny_autoidle(struct clk_ti_autoidle *clk)
		{
		u32 val;

		@@ -63,31 +102,31 @@ static void ti_deny_autoidle(struct clk_ti_autoidle *clk)
		}

		/**
		* of_ti_clk_allow_autoidle_all - enable autoidle for all clocks
		* _clk_generic_allow_autoidle_all - enable autoidle for all clocks
		*
		* Enables hardware autoidle for all registered DT clocks, which have
		* the feature.
		*/
		void of_ti_clk_allow_autoidle_all(void)
		static void _clk_generic_allow_autoidle_all(void)
		{
		struct clk_ti_autoidle *c;

		list_for_each_entry(c, &autoidle_clks, node)
		ti_allow_autoidle(c);
		_allow_autoidle(c);
		}

		/**
		* of_ti_clk_deny_autoidle_all - disable autoidle for all clocks
		* _clk_generic_deny_autoidle_all - disable autoidle for all clocks
		*
		* Disables hardware autoidle for all registered DT clocks, which have
		* the feature.
		*/
		void of_ti_clk_deny_autoidle_all(void)
		static void _clk_generic_deny_autoidle_all(void)
		{
		struct clk_ti_autoidle *c;

		list_for_each_entry(c, &autoidle_clks, node)
		ti_deny_autoidle(c);
		_deny_autoidle(c);
		}

		/**
		@@ -131,3 +170,67 @@ int __init of_ti_clk_autoidle_setup(struct device_node *node)

		return 0;
		}

		/**
		* omap2_init_clk_hw_omap_clocks - initialize an OMAP clock
		* @clk: struct clk * to initialize
		*
		* Add an OMAP clock @clk to the internal list of OMAP clocks. Used
		* temporarily for autoidle handling, until this support can be
		* integrated into the common clock framework code in some way. No
		* return value.
		*/
		void omap2_init_clk_hw_omap_clocks(struct clk *clk)
		{
		struct clk_hw_omap *c;

		if (__clk_get_flags(clk) & CLK_IS_BASIC)
		return;

		c = to_clk_hw_omap(__clk_get_hw(clk));
		list_add(&c->node, &clk_hw_omap_clocks);
		}

		/**
		* omap2_clk_enable_autoidle_all - enable autoidle on all OMAP clocks that
		* support it
		*
		* Enable clock autoidle on all OMAP clocks that have allow_idle
		* function pointers associated with them. This function is intended
		* to be temporary until support for this is added to the common clock
		* code. Returns 0.
		*/
		int omap2_clk_enable_autoidle_all(void)
		{
		struct clk_hw_omap *c;

		list_for_each_entry(c, &clk_hw_omap_clocks, node)
		if (c->ops && c->ops->allow_idle)
		c->ops->allow_idle(c);

		_clk_generic_allow_autoidle_all();

		return 0;
		}

		/**
		* omap2_clk_disable_autoidle_all - disable autoidle on all OMAP clocks that
		* support it
		*
		* Disable clock autoidle on all OMAP clocks that have allow_idle
		* function pointers associated with them. This function is intended
		* to be temporary until support for this is added to the common clock
		* code. Returns 0.
		*/
		int omap2_clk_disable_autoidle_all(void)
		{
		struct clk_hw_omap *c;

		list_for_each_entry(c, &clk_hw_omap_clocks, node)
		if (c->ops && c->ops->deny_idle)
		c->ops->deny_idle(c);

		_clk_generic_deny_autoidle_all();

		return 0;
		}

drivers/clk/ti/clock.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,9 @@ void ti_clk_patch_legacy_clks(struct ti_clk **patch);
		struct clk ti_clk_register_clk(struct ti_clk setup);
		int ti_clk_register_legacy_clks(struct ti_clk_alias *clks);

		void omap2_init_clk_hw_omap_clocks(struct clk *clk);
		int of_ti_clk_autoidle_setup(struct device_node *node);

		extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
		extern const struct clk_hw_omap_ops clkhwops_iclk;
		extern const struct clk_hw_omap_ops clkhwops_iclk_wait;

drivers/clk/ti/fixed-factor.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		#include <linux/of_address.h>
		#include <linux/clk/ti.h>

		#include "clock.h"

		#undef pr_fmt
		#define pr_fmt(fmt) "%s: " fmt, __func__