Commit d3921a03 authored by Paul Bolle's avatar Paul Bolle Committed by Greg Kroah-Hartman

staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP

Commit d0f47ff1 ("ASoC: OMAP: Build config cleanup for McBSP")
removed the Kconfig symbol OMAP_MCBSP. It left two checks for
CONFIG_OMAP_MCBSP untouched.

Convert these to checks for CONFIG_SND_OMAP_SOC_MCBSP. That must be
correct, since that re-enables calls to functions that are all found in
sound/soc/omap/mcbsp.c. And that file is built only if
CONFIG_SND_OMAP_SOC_MCBSP is defined.

Fixes: d0f47ff1 ("ASoC: OMAP: Build config cleanup for McBSP")
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8cc81f8
...@@ -226,7 +226,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id) ...@@ -226,7 +226,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)
case GPT_CLK: case GPT_CLK:
status = omap_dm_timer_start(timer[clk_id - 1]); status = omap_dm_timer_start(timer[clk_id - 1]);
break; break;
#ifdef CONFIG_OMAP_MCBSP #ifdef CONFIG_SND_OMAP_SOC_MCBSP
case MCBSP_CLK: case MCBSP_CLK:
omap_mcbsp_request(MCBSP_ID(clk_id)); omap_mcbsp_request(MCBSP_ID(clk_id));
omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC); omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PAD_SRC);
...@@ -302,7 +302,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id) ...@@ -302,7 +302,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id)
case GPT_CLK: case GPT_CLK:
status = omap_dm_timer_stop(timer[clk_id - 1]); status = omap_dm_timer_stop(timer[clk_id - 1]);
break; break;
#ifdef CONFIG_OMAP_MCBSP #ifdef CONFIG_SND_OMAP_SOC_MCBSP
case MCBSP_CLK: case MCBSP_CLK:
omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PRCM_SRC); omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PRCM_SRC);
omap_mcbsp_free(MCBSP_ID(clk_id)); omap_mcbsp_free(MCBSP_ID(clk_id));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment