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

Commit 7558562a authored Dec 14, 2017 by Tony Lindgren

clk: ti: Drop legacy clk-3xxx-legacy code



We have now had omap3 booting in device tree only mode for a while
and all this code is unused.

Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent ffb009b2

drivers/clk/ti/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,10 +19,6 @@ obj-$(CONFIG_SOC_DRA7XX) += $(clk-common) clk-7xx.o \
		clk-dra7-atl.o dpll3xxx.o dpll44xx.o
		obj-$(CONFIG_SOC_AM43XX) += $(clk-common) dpll3xxx.o clk-43xx.o

		ifdef CONFIG_ATAGS
		obj-$(CONFIG_ARCH_OMAP3) += clk-3xxx-legacy.o
		endif

		endif # CONFIG_ARCH_OMAP2PLUS

		obj-$(CONFIG_COMMON_CLK_TI_ADPLL) += adpll.o

drivers/clk/ti/clk-3xxx-legacy.c

deleted100644 → 0

+0 −4656

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/clk/ti/clk.c

+0 −135

Original line number	Diff line number	Diff line
		@@ -336,141 +336,6 @@ void ti_dt_clk_init_retry_clks(void)
		}
		}

		#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_ATAGS)
		void __init ti_clk_patch_legacy_clks(struct ti_clk **patch)
		{
		while (*patch) {
		memcpy((patch)->patch, patch, sizeof(**patch));
		patch++;
		}
		}

		struct clk __init ti_clk_register_clk(struct ti_clk setup)
		{
		struct clk *clk;
		struct ti_clk_fixed *fixed;
		struct ti_clk_fixed_factor *fixed_factor;
		struct clk_hw *clk_hw;
		int ret;

		if (setup->clk)
		return setup->clk;

		switch (setup->type) {
		case TI_CLK_FIXED:
		fixed = setup->data;

		clk = clk_register_fixed_rate(NULL, setup->name, NULL, 0,
		fixed->frequency);
		if (!IS_ERR(clk)) {
		ret = ti_clk_add_alias(NULL, clk, setup->name);
		if (ret) {
		clk_unregister(clk);
		clk = ERR_PTR(ret);
		}
		}
		break;
		case TI_CLK_MUX:
		clk = ti_clk_register_mux(setup);
		break;
		case TI_CLK_DIVIDER:
		clk = ti_clk_register_divider(setup);
		break;
		case TI_CLK_COMPOSITE:
		clk = ti_clk_register_composite(setup);
		break;
		case TI_CLK_FIXED_FACTOR:
		fixed_factor = setup->data;

		clk = clk_register_fixed_factor(NULL, setup->name,
		fixed_factor->parent,
		0, fixed_factor->mult,
		fixed_factor->div);
		if (!IS_ERR(clk)) {
		ret = ti_clk_add_alias(NULL, clk, setup->name);
		if (ret) {
		clk_unregister(clk);
		clk = ERR_PTR(ret);
		}
		}
		break;
		case TI_CLK_GATE:
		clk = ti_clk_register_gate(setup);
		break;
		case TI_CLK_DPLL:
		clk = ti_clk_register_dpll(setup);
		break;
		default:
		pr_err("bad type for %s!\n", setup->name);
		clk = ERR_PTR(-EINVAL);
		}

		if (!IS_ERR(clk)) {
		setup->clk = clk;
		if (setup->clkdm_name) {
		clk_hw = __clk_get_hw(clk);
		if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
		pr_warn("can't setup clkdm for basic clk %s\n",
		setup->name);
		} else {
		to_clk_hw_omap(clk_hw)->clkdm_name =
		setup->clkdm_name;
		omap2_init_clk_clkdm(clk_hw);
		}
		}
		}

		return clk;
		}

		int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks)
		{
		struct clk *clk;
		bool retry;
		struct ti_clk_alias *retry_clk;
		struct ti_clk_alias *tmp;

		while (clks->clk) {
		clk = ti_clk_register_clk(clks->clk);
		if (IS_ERR(clk)) {
		if (PTR_ERR(clk) == -EAGAIN) {
		list_add(&clks->link, &retry_list);
		} else {
		pr_err("register for %s failed: %ld\n",
		clks->clk->name, PTR_ERR(clk));
		return PTR_ERR(clk);
		}
		}
		clks++;
		}

		retry = true;

		while (!list_empty(&retry_list) && retry) {
		retry = false;
		list_for_each_entry_safe(retry_clk, tmp, &retry_list, link) {
		pr_debug("retry-init: %s\n", retry_clk->clk->name);
		clk = ti_clk_register_clk(retry_clk->clk);
		if (IS_ERR(clk)) {
		if (PTR_ERR(clk) == -EAGAIN) {
		continue;
		} else {
		pr_err("register for %s failed: %ld\n",
		retry_clk->clk->name,
		PTR_ERR(clk));
		return PTR_ERR(clk);
		}
		} else {
		retry = true;
		list_del(&retry_clk->link);
		}
		}
		}

		return 0;
		}
		#endif

		static const struct of_device_id simple_clk_match_table[] __initconst = {
		{ .compatible = "fixed-clock" },
		{ .compatible = "fixed-factor-clock" },

drivers/clk/ti/clock.h

+0 −68

Original line number	Diff line number	Diff line
		@@ -92,17 +92,6 @@ struct ti_clk {
		struct clk *clk;
		};

		struct ti_clk_alias {
		struct ti_clk *clk;
		struct clk_lookup lk;
		struct list_head link;
		};

		struct ti_clk_fixed {
		u32 frequency;
		u16 flags;
		};

		struct ti_clk_mux {
		u8 bit_shift;
		int num_parents;
		@@ -123,13 +112,6 @@ struct ti_clk_divider {
		u16 flags;
		};

		struct ti_clk_fixed_factor {
		const char *parent;
		u16 div;
		u16 mult;
		u16 flags;
		};

		struct ti_clk_gate {
		const char *parent;
		u8 bit_shift;
		@@ -138,44 +120,6 @@ struct ti_clk_gate {
		u16 flags;
		};

		struct ti_clk_composite {
		struct ti_clk_divider *divider;
		struct ti_clk_mux *mux;
		struct ti_clk_gate *gate;
		u16 flags;
		};

		struct ti_clk_clkdm_gate {
		const char *parent;
		u16 flags;
		};

		struct ti_clk_dpll {
		int num_parents;
		u16 control_reg;
		u16 idlest_reg;
		u16 autoidle_reg;
		u16 mult_div1_reg;
		u8 module;
		const char **parents;
		u16 flags;
		u8 modes;
		u32 mult_mask;
		u32 div1_mask;
		u32 enable_mask;
		u32 autoidle_mask;
		u32 freqsel_mask;
		u32 idlest_mask;
		u32 dco_mask;
		u32 sddiv_mask;
		u16 max_multiplier;
		u16 max_divider;
		u8 min_divider;
		u8 auto_recal_bit;
		u8 recal_en_bit;
		u8 recal_st_bit;
		};

		/* Composite clock component types */
		enum {
		CLK_COMPONENT_TYPE_GATE = 0,
		@@ -237,29 +181,17 @@ extern const struct omap_clkctrl_data omap4_clkctrl_data[];

		typedef void (ti_of_clk_init_cb_t)(void , struct device_node *);

		struct clk ti_clk_register_gate(struct ti_clk setup);
		struct clk ti_clk_register_interface(struct ti_clk setup);
		struct clk ti_clk_register_mux(struct ti_clk setup);
		struct clk ti_clk_register_divider(struct ti_clk setup);
		struct clk ti_clk_register_composite(struct ti_clk setup);
		struct clk ti_clk_register_dpll(struct ti_clk setup);
		struct clk ti_clk_register(struct device dev, struct clk_hw *hw,
		const char *con);
		int ti_clk_add_alias(struct device dev, struct clk clk, const char *con);
		void ti_clk_add_aliases(void);

		struct clk_hw ti_clk_build_component_div(struct ti_clk_divider setup);
		struct clk_hw ti_clk_build_component_gate(struct ti_clk_gate setup);
		struct clk_hw ti_clk_build_component_mux(struct ti_clk_mux setup);

		int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
		u8 flags, u8 *width,
		const struct clk_div_table **table);

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

		int ti_clk_get_reg_addr(struct device_node *node, int index,
		struct clk_omap_reg *reg);
		void ti_dt_clocks_register(struct ti_dt_clk *oclks);

drivers/clk/ti/composite.c

+0 −45

Original line number	Diff line number	Diff line
		@@ -116,51 +116,6 @@ static inline struct clk_hw _get_hw(struct clk_hw_omap_comp clk, int idx)

		#define to_clk_hw_comp(_hw) container_of(_hw, struct clk_hw_omap_comp, hw)

		#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_ATAGS)
		struct clk ti_clk_register_composite(struct ti_clk setup)
		{
		struct ti_clk_composite *comp;
		struct clk_hw *gate;
		struct clk_hw *mux;
		struct clk_hw *div;
		int num_parents = 1;
		const char * const *parent_names = NULL;
		struct clk *clk;
		int ret;

		comp = setup->data;

		div = ti_clk_build_component_div(comp->divider);
		gate = ti_clk_build_component_gate(comp->gate);
		mux = ti_clk_build_component_mux(comp->mux);

		if (div)
		parent_names = &comp->divider->parent;

		if (gate)
		parent_names = &comp->gate->parent;

		if (mux) {
		num_parents = comp->mux->num_parents;
		parent_names = comp->mux->parents;
		}

		clk = clk_register_composite(NULL, setup->name,
		parent_names, num_parents, mux,
		&ti_clk_mux_ops, div,
		&ti_composite_divider_ops, gate,
		&ti_composite_gate_ops, 0);

		ret = ti_clk_add_alias(NULL, clk, setup->name);
		if (ret) {
		clk_unregister(clk);
		return ERR_PTR(ret);
		}

		return clk;
		}
		#endif

		static void __init _register_composite(void *user,
		struct device_node *node)
		{