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

Commit 7956a031 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge tag 'omap-for-v4.16/clk-omap3-legacy-signed' of... 

Merge tag 'omap-for-v4.16/clk-omap3-legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into clk-omap

Drop unused omap3 clock data

We have been booting omap3 in device tree only mode for a while now,
so this is all unused now.
parents 4fbd8d19 7558562a

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/apll.c

+2 −1
Original line number Diff line number Diff line
@@ -133,9 +133,10 @@ static const struct clk_ops apll_ck_ops = { 
	.get_parent	= &dra7_init_apll_parent,

};



static void __init omap_clk_register_apll(struct clk_hw *hw,

static void __init omap_clk_register_apll(void *user,

					  struct device_node *node)

{

	struct clk_hw *hw = user;

	struct clk_hw_omap *clk_hw = to_clk_hw_omap(hw);

	struct dpll_data *ad = clk_hw->dpll_data;

	struct clk *clk;