diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 43 | 
1 files changed, 3 insertions, 40 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index bace9308a4db..002745181ad6 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -1774,8 +1774,6 @@ static struct omap_clk omap2420_clks[] = {  	CLK(NULL,	"osc_ck",	&osc_ck,	CK_242X),  	CLK(NULL,	"sys_ck",	&sys_ck,	CK_242X),  	CLK(NULL,	"alt_ck",	&alt_ck,	CK_242X), -	CLK("omap-mcbsp.1",	"pad_fck",	&mcbsp_clks,	CK_242X), -	CLK("omap-mcbsp.2",	"pad_fck",	&mcbsp_clks,	CK_242X),  	CLK(NULL,	"mcbsp_clks",	&mcbsp_clks,	CK_242X),  	/* internal analog sources */  	CLK(NULL,	"dpll_ck",	&dpll_ck,	CK_242X), @@ -1784,8 +1782,6 @@ static struct omap_clk omap2420_clks[] = {  	/* internal prcm root sources */  	CLK(NULL,	"func_54m_ck",	&func_54m_ck,	CK_242X),  	CLK(NULL,	"core_ck",	&core_ck,	CK_242X), -	CLK("omap-mcbsp.1",	"prcm_fck",	&func_96m_ck,	CK_242X), -	CLK("omap-mcbsp.2",	"prcm_fck",	&func_96m_ck,	CK_242X),  	CLK(NULL,	"func_96m_ck",	&func_96m_ck,	CK_242X),  	CLK(NULL,	"func_48m_ck",	&func_48m_ck,	CK_242X),  	CLK(NULL,	"func_12m_ck",	&func_12m_ck,	CK_242X), @@ -1901,42 +1897,9 @@ static struct omap_clk omap2420_clks[] = {  	CLK(NULL,	"pka_ick",	&pka_ick,	CK_242X),  	CLK(NULL,	"usb_fck",	&usb_fck,	CK_242X),  	CLK("musb-hdrc",	"fck",	&osc_ck,	CK_242X), -	CLK("omap_timer.1",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.2",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.3",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.4",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.5",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.6",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.7",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.8",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.9",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.10",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.11",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.12",	"32k_ck",	&func_32k_ck,	CK_243X), -	CLK("omap_timer.1",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.2",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.3",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.4",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.5",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.6",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.7",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.8",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.9",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.10",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.11",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.12",	"sys_ck",	&sys_ck,	CK_243X), -	CLK("omap_timer.1",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.2",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.3",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.4",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.5",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.6",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.7",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.8",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.9",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.10",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.11",	"alt_ck",	&alt_ck,	CK_243X), -	CLK("omap_timer.12",	"alt_ck",	&alt_ck,	CK_243X), +	CLK(NULL,	"timer_32k_ck",	&func_32k_ck,	CK_243X), +	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_243X), +	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_243X),  };  /*  | 
