diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2011-06-17 02:21:34 -0500 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-06-24 11:36:21 -0700 |
| commit | c7e67e3378044f5da565b460400ef79db5c7efc5 (patch) | |
| tree | afda4523af77b5a834a095172a66203982504f0c /arch/arm | |
| parent | 30f5d24b61423ecf6965038f9b54e1fe036035e3 (diff) | |
| download | kernel_samsung_tuna-c7e67e3378044f5da565b460400ef79db5c7efc5.zip kernel_samsung_tuna-c7e67e3378044f5da565b460400ef79db5c7efc5.tar.gz kernel_samsung_tuna-c7e67e3378044f5da565b460400ef79db5c7efc5.tar.bz2 | |
OMAP4: McBSP: Change fclk source names per OMAP version
OMAP4 McBSP FCLK uses clock sources with different names than
OMAP3. The names for the clock sources are now associated with
the OMAP version.
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 10 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 699ef91..01447f6 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c @@ -71,9 +71,9 @@ int omap2_mcbsp_set_clks_src(u8 id, u8 fck_src_id) mcbsp = id_to_mcbsp_ptr(id); if (fck_src_id == MCBSP_CLKS_PAD_SRC) - fck_src_name = "pad_fck"; + fck_src_name = mcbsp->pdata->clks_pad_src; else if (fck_src_id == MCBSP_CLKS_PRCM_SRC) - fck_src_name = "prcm_fck"; + fck_src_name = mcbsp->pdata->clks_prcm_src; else return -EINVAL; @@ -129,6 +129,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) pdata->mcbsp_config_type = oh->class->rev; 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; @@ -136,6 +139,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 50a0d5c..ddada0b 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h @@ -403,6 +403,8 @@ struct omap_mcbsp_platform_data { #endif u16 buffer_size; unsigned int mcbsp_config_type; + char clks_pad_src[30]; + char clks_prcm_src[30]; }; struct omap_mcbsp_st_data { |