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

Commit b3153100 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Paul Walmsley
Browse files

ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420 



Remove the existing alias for pad_fck, prcm_fck from the clock data and
add them as opt_clks to the hwmod data.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 485802a6

arch/arm/mach-omap2/clock2420_data.c

+0 −4
Original line number Diff line number Diff line
@@ -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),

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+9 −0
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ static struct omap_hwmod_class omap2420_mcbsp_hwmod_class = { 
	.name = "mcbsp",

};



static struct omap_hwmod_opt_clk mcbsp_opt_clks[] = {

	{ .role = "pad_fck", .clk = "mcbsp_clks" },

	{ .role = "prcm_fck", .clk = "func_96m_ck" },

};



/* mcbsp1 */

static struct omap_hwmod_irq_info omap2420_mcbsp1_irqs[] = {

	{ .name = "tx", .irq = 59 },
@@ -214,6 +219,8 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_MCBSP1_SHIFT,

		},

	},

	.opt_clks	= mcbsp_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(mcbsp_opt_clks),

};



/* mcbsp2 */
@@ -238,6 +245,8 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = { 
			.idlest_idle_bit = OMAP24XX_ST_MCBSP2_SHIFT,

		},

	},

	.opt_clks	= mcbsp_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(mcbsp_opt_clks),

};



static struct omap_hwmod_class_sysconfig omap2420_msdi_sysc = {