diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:04:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:05:06 +0100 |
| commit | 07b98403ee67838bbaded43bd687875b9d7f74e0 (patch) | |
| tree | 0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc /arch/arm/mach-omap2/mcbsp.c | |
| parent | net: macb: fix build break with !CONFIG_OF (diff) | |
| parent | Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff) | |
| download | linux-07b98403ee67838bbaded43bd687875b9d7f74e0.tar.xz linux-07b98403ee67838bbaded43bd687875b9d7f74e0.zip | |
Merge branch 'omap/hwmod' into next/drivers
This is needed as a dependency for omap/ehci.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/mcbsp.c')
| -rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 292eee3be15f..28fcb27005d2 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c @@ -145,6 +145,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) pdata->reg_size = 4; pdata->has_ccr = true; } + pdata->set_clk_src = omap2_mcbsp_set_clk_src; + if (id == 1) + pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; if (oh->class->rev == MCBSP_CONFIG_TYPE3) { if (id == 2) @@ -174,9 +177,6 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) name, oh->name); return PTR_ERR(pdev); } - pdata->set_clk_src = omap2_mcbsp_set_clk_src; - if (id == 1) - pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; omap_mcbsp_count++; return 0; } |