Commit 4450cb7d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-devel-am33xx-data-for-v3.6' of... 

Merge tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/clk

From Tony Lindgren <tony@atomide.com>:

This branch adds clock data for am33xx. Note that eventually these
will use the common clock framework, but those patches are not quite
ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6
branch.

* tag 'omap-devel-am33xx-data-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP3+: clock33xx: Add AM33XX clock tree data
  ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 99ac7b57 79ab2664

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

arch/arm/mach-omap2/clock33xx_data.c

0 → 100644
+1105 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock3xxx_data.c

+4 −16
Original line number Diff line number Diff line
@@ -93,18 +93,6 @@ static struct clk virt_16_8m_ck = { 
	.rate		= 16800000,

};



static struct clk virt_19_2m_ck = {

	.name		= "virt_19_2m_ck",

	.ops		= &clkops_null,

	.rate		= 19200000,

};



static struct clk virt_26m_ck = {

	.name		= "virt_26m_ck",

	.ops		= &clkops_null,

	.rate		= 26000000,

};



static struct clk virt_38_4m_ck = {

	.name		= "virt_38_4m_ck",

	.ops		= &clkops_null,
@@ -145,8 +133,8 @@ static const struct clksel osc_sys_clksel[] = { 
	{ .parent = &virt_12m_ck,   .rates = osc_sys_12m_rates },

	{ .parent = &virt_13m_ck,   .rates = osc_sys_13m_rates },

	{ .parent = &virt_16_8m_ck, .rates = osc_sys_16_8m_rates },

	{ .parent = &virt_19_2m_ck, .rates = osc_sys_19_2m_rates },

	{ .parent = &virt_26m_ck,   .rates = osc_sys_26m_rates },

	{ .parent = &virt_19200000_ck, .rates = osc_sys_19_2m_rates },

	{ .parent = &virt_26000000_ck,   .rates = osc_sys_26m_rates },

	{ .parent = &virt_38_4m_ck, .rates = osc_sys_38_4m_rates },

	{ .parent = NULL },

};
@@ -3230,8 +3218,8 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"virt_12m_ck",	&virt_12m_ck,	CK_3XXX),

	CLK(NULL,	"virt_13m_ck",	&virt_13m_ck,	CK_3XXX),

	CLK(NULL,	"virt_16_8m_ck", &virt_16_8m_ck, CK_3430ES2PLUS | CK_AM35XX  | CK_36XX),

	CLK(NULL,	"virt_19_2m_ck", &virt_19_2m_ck, CK_3XXX),

	CLK(NULL,	"virt_26m_ck",	&virt_26m_ck,	CK_3XXX),

	CLK(NULL,	"virt_19200000_ck", &virt_19200000_ck, CK_3XXX),

	CLK(NULL,	"virt_26000000_ck",	&virt_26000000_ck,	CK_3XXX),

	CLK(NULL,	"virt_38_4m_ck", &virt_38_4m_ck, CK_3XXX),

	CLK(NULL,	"osc_sys_ck",	&osc_sys_ck,	CK_3XXX),

	CLK(NULL,	"sys_ck",	&sys_ck,	CK_3XXX),

arch/arm/mach-omap2/clock44xx_data.c

+0 −72
Original line number Diff line number Diff line
@@ -107,18 +107,6 @@ static struct clk virt_16800000_ck = { 
	.rate		= 16800000,

};



static struct clk virt_19200000_ck = {

	.name		= "virt_19200000_ck",

	.ops		= &clkops_null,

	.rate		= 19200000,

};



static struct clk virt_26000000_ck = {

	.name		= "virt_26000000_ck",

	.ops		= &clkops_null,

	.rate		= 26000000,

};



static struct clk virt_27000000_ck = {

	.name		= "virt_27000000_ck",

	.ops		= &clkops_null,
@@ -131,31 +119,6 @@ static struct clk virt_38400000_ck = { 
	.rate		= 38400000,

};



static const struct clksel_rate div_1_0_rates[] = {

	{ .div = 1, .val = 0, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel_rate div_1_1_rates[] = {

	{ .div = 1, .val = 1, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel_rate div_1_2_rates[] = {

	{ .div = 1, .val = 2, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel_rate div_1_3_rates[] = {

	{ .div = 1, .val = 3, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel_rate div_1_4_rates[] = {

	{ .div = 1, .val = 4, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel_rate div_1_5_rates[] = {

	{ .div = 1, .val = 5, .flags = RATE_IN_4430 },

	{ .div = 0 },
@@ -289,41 +252,6 @@ static struct clk dpll_abe_x2_ck = { 
	.recalc		= &omap3_clkoutx2_recalc,

};



static const struct clksel_rate div31_1to31_rates[] = {

	{ .div = 1, .val = 1, .flags = RATE_IN_4430 },

	{ .div = 2, .val = 2, .flags = RATE_IN_4430 },

	{ .div = 3, .val = 3, .flags = RATE_IN_4430 },

	{ .div = 4, .val = 4, .flags = RATE_IN_4430 },

	{ .div = 5, .val = 5, .flags = RATE_IN_4430 },

	{ .div = 6, .val = 6, .flags = RATE_IN_4430 },

	{ .div = 7, .val = 7, .flags = RATE_IN_4430 },

	{ .div = 8, .val = 8, .flags = RATE_IN_4430 },

	{ .div = 9, .val = 9, .flags = RATE_IN_4430 },

	{ .div = 10, .val = 10, .flags = RATE_IN_4430 },

	{ .div = 11, .val = 11, .flags = RATE_IN_4430 },

	{ .div = 12, .val = 12, .flags = RATE_IN_4430 },

	{ .div = 13, .val = 13, .flags = RATE_IN_4430 },

	{ .div = 14, .val = 14, .flags = RATE_IN_4430 },

	{ .div = 15, .val = 15, .flags = RATE_IN_4430 },

	{ .div = 16, .val = 16, .flags = RATE_IN_4430 },

	{ .div = 17, .val = 17, .flags = RATE_IN_4430 },

	{ .div = 18, .val = 18, .flags = RATE_IN_4430 },

	{ .div = 19, .val = 19, .flags = RATE_IN_4430 },

	{ .div = 20, .val = 20, .flags = RATE_IN_4430 },

	{ .div = 21, .val = 21, .flags = RATE_IN_4430 },

	{ .div = 22, .val = 22, .flags = RATE_IN_4430 },

	{ .div = 23, .val = 23, .flags = RATE_IN_4430 },

	{ .div = 24, .val = 24, .flags = RATE_IN_4430 },

	{ .div = 25, .val = 25, .flags = RATE_IN_4430 },

	{ .div = 26, .val = 26, .flags = RATE_IN_4430 },

	{ .div = 27, .val = 27, .flags = RATE_IN_4430 },

	{ .div = 28, .val = 28, .flags = RATE_IN_4430 },

	{ .div = 29, .val = 29, .flags = RATE_IN_4430 },

	{ .div = 30, .val = 30, .flags = RATE_IN_4430 },

	{ .div = 31, .val = 31, .flags = RATE_IN_4430 },

	{ .div = 0 },

};



static const struct clksel dpll_abe_m2x2_div[] = {

	{ .parent = &dpll_abe_x2_ck, .rates = div31_1to31_rates },

	{ .parent = NULL },

CRA Git | Maintained and supported by SUSTech CRA and CCSE