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

Commit 43c56e04 authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: dra7xx: rename existing clkctrl data as compat data 



Rename the existing clkctrl data in preparation of upcoming clkdm
based split for it. Once the DT data has transitioned also, the
compat data can be removed.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
parent 76a1049b

drivers/clk/ti/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o \ 
obj-$(CONFIG_SOC_OMAP5)			+= $(clk-common) clk-54xx.o \

					   dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_DRA7XX)		+= $(clk-common) clk-7xx.o \

					   clk-dra7-atl.o dpll3xxx.o dpll44xx.o

					   clk-dra7-atl.o dpll3xxx.o \

					   dpll44xx.o clk-7xx-compat.o

obj-$(CONFIG_SOC_AM43XX)		+= $(clk-common) dpll3xxx.o clk-43xx.o \

					   clk-43xx-compat.o

drivers/clk/ti/clk-7xx-compat.c

0 → 100644
+823 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/clk/ti/clk-7xx.c

+1 −801

File changed.

Preview size limit exceeded, changes collapsed.

drivers/clk/ti/clkctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) 
#endif

#ifdef CONFIG_SOC_DRA7XX

	if (of_machine_is_compatible("ti,dra7"))

		data = dra7_clkctrl_data;

		data = dra7_clkctrl_compat_data;

#endif

#ifdef CONFIG_SOC_AM33XX

	if (of_machine_is_compatible("ti,am33xx")) {

drivers/clk/ti/clock.h

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ struct omap_clkctrl_data { 


extern const struct omap_clkctrl_data omap4_clkctrl_data[];

extern const struct omap_clkctrl_data omap5_clkctrl_data[];

extern const struct omap_clkctrl_data dra7_clkctrl_data[];

extern const struct omap_clkctrl_data dra7_clkctrl_compat_data[];

extern struct ti_dt_clk dra7xx_compat_clks[];

extern const struct omap_clkctrl_data am3_clkctrl_data[];

extern const struct omap_clkctrl_data am3_clkctrl_compat_data[];

extern struct ti_dt_clk am33xx_compat_clks[];