staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP

PATCH New Paul Bolle 1 participant 1 message May 26, 2014 Staging

Share & tools

Paul Bolle

author

2014-05-26 19:47 UTC #0 lore raw

PATCH 1/1 staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP

Commit d0f47ff17f29 ("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 d0f47ff17f29 ("ASoC: OMAP: Build config cleanup for McBSP")

Signed-off-by Paul Bolle <[email protected]>

---
Untested. Note that commit d0f47ff17f29 shipped in v3.4, so these few lines of code haven't been built for a while. Done on top of next-20140526.

 drivers/staging/tidspbridge/core/dsp-clock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/staging/tidspbridge/core/dsp-clock.c +2 -2

index 2f084e181d39..a1aca4416ca7 100644
@@ -226,7 +226,7 @@ int dsp_clk_enable(enum dsp_clk_id clk_id)
 	case GPT_CLK:
 		status = omap_dm_timer_start(timer[clk_id - 1]);
 		break;
-#ifdef CONFIG_OMAP_MCBSP
+#ifdef CONFIG_SND_OMAP_SOC_MCBSP
 	case MCBSP_CLK:
 		omap_mcbsp_request(MCBSP_ID(clk_id));
 		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)
 	case GPT_CLK:
 		status = omap_dm_timer_stop(timer[clk_id - 1]);
 		break;
-#ifdef CONFIG_OMAP_MCBSP
+#ifdef CONFIG_SND_OMAP_SOC_MCBSP
 	case MCBSP_CLK:
 		omap2_mcbsp_set_clks_src(MCBSP_ID(clk_id), MCBSP_CLKS_PRCM_SRC);
 		omap_mcbsp_free(MCBSP_ID(clk_id));

Signature · 1 line

1.9.0