lkml.org 
[lkml]   [2015]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 028/175] ASoC: davinci: fix DM365_EVM codec selection
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit f9a7ba326938f03b9305af8d31c360fce10cd4df upstream.

    An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol
    tristate to avoid creating an undefined reference from the
    davinci-vcif.c driver to the davinci_soc_platform_register
    function that may be in a module.

    However, this may now lead to a different error on randconfig
    kernels:

    "warning: SND_DM365_VOICE_CODEC creates inconsistent choice state"

    This happens because we now have a choice statement with
    one bool and one tristate option, and the latter might not
    support being set to 'y' because of dependencies.

    This new change turns the other option into 'tristate' as well,
    which avoids the problem.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/davinci/Kconfig | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/sound/soc/davinci/Kconfig
    +++ b/sound/soc/davinci/Kconfig
    @@ -58,13 +58,12 @@ choice
    depends on MACH_DAVINCI_DM365_EVM

    config SND_DM365_AIC3X_CODEC
    - bool "Audio Codec - AIC3101"
    + tristate "Audio Codec - AIC3101"
    help
    Say Y if you want to add support for AIC3101 audio codec

    config SND_DM365_VOICE_CODEC
    tristate "Voice Codec - CQ93VC"
    - depends on SND_DAVINCI_SOC
    select MFD_DAVINCI_VOICECODEC
    select SND_DAVINCI_SOC_VCIF
    select SND_SOC_CQ0093VC



    \
     
     \ /
      Last update: 2015-03-04 08:41    [W:3.527 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site