lkml.org 
[lkml]   [2014]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 185/198] staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP
    Date
    3.11.10.13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Bolle <pebolle@tiscali.nl>

    commit d3921a03a89acb1b9ca599590c0131c89f8737d8 upstream.

    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 <pebolle@tiscali.nl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/staging/tidspbridge/core/dsp-clock.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
    index 2f084e181d39..a1aca4416ca7 100644
    --- a/drivers/staging/tidspbridge/core/dsp-clock.c
    +++ b/drivers/staging/tidspbridge/core/dsp-clock.c
    @@ -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));
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-03 12:21    [W:4.061 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site