diff options
-rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 8 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index fb4bcf81a18..3a419faad32 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c @@ -80,6 +80,8 @@ static int omap2_mcbsp_set_clk_src(struct device *dev, struct clk *clk, else return -EINVAL; +/*mcbsp->pdata->clks_pad_src; ...prcm_src*/ + fck_src = clk_get(dev, fck_src_name); if (IS_ERR_OR_NULL(fck_src)) { pr_err("omap-mcbsp: %s: could not clk_get() %s\n", "clks", @@ -150,6 +152,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; if (oh->class->rev == MCBSP_CONFIG_TYPE3) { + strcpy(pdata->clks_pad_src, "pad_clks_ck"); + strcpy(pdata->clks_prcm_src, "mcbsp2_sync_mux_ck"); + if (id == 2) /* The FIFO has 1024 + 256 locations */ pdata->buffer_size = 0x500; @@ -157,6 +162,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) /* The FIFO has 128 locations */ pdata->buffer_size = 0x80; } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) { + strcpy(pdata->clks_pad_src, "pad_clks_ck"); + strcpy(pdata->clks_prcm_src, "mcbsp2_sync_mux_ck"); + /* The FIFO has 128 locations for all instances */ pdata->buffer_size = 0x80; } diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index 7cfd3d48d95..00c24cee4d2 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h @@ -304,6 +304,9 @@ struct omap_mcbsp_platform_data { u8 reg_size; u8 reg_step; + char clks_pad_src[30]; + char clks_prcm_src[30]; + /* McBSP platform and instance specific features */ bool has_wakeup; /* Wakeup capability */ bool has_ccr; /* Transceiver has configuration control registers */ |