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

Commit 79ab2664 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-devel-e-for-3.5' of... 

Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data

OMAP AM33xx clock data

Conflicts:
	arch/arm/mach-omap2/Makefile
parents ecc46cfd e30384ab

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o 
obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_AM33XX)		+= clock33xx_data.o



# OMAP2 clock rate set data (old "OPP" data)

obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o

arch/arm/mach-omap2/clock.h

+14 −0
Original line number Diff line number Diff line
@@ -155,4 +155,18 @@ extern const struct clkops clkops_omap3_noncore_dpll_ops; 
extern const struct clkops clkops_omap3_core_dpll_ops;

extern const struct clkops clkops_omap4_dpllmx_ops;



/* clksel_rate blocks shared between OMAP44xx and AM33xx */

extern const struct clksel_rate div_1_0_rates[];

extern const struct clksel_rate div_1_1_rates[];

extern const struct clksel_rate div_1_2_rates[];

extern const struct clksel_rate div_1_3_rates[];

extern const struct clksel_rate div_1_4_rates[];

extern const struct clksel_rate div31_1to31_rates[];



/* clocks shared between various OMAP SoCs */

extern struct clk virt_19200000_ck;

extern struct clk virt_26000000_ck;



extern int am33xx_clk_init(void);



#endif