lkml.org 
[lkml]   [2016]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 38/92] ASoC: fix broken pxa SoC support
    Date
    From: Robert Jarzmik <robert.jarzmik@free.fr>

    3.4.112-rc1 review patch. If anyone has any objections, please let me know.

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


    commit 3c8f7710c1c44fb650bc29b6ef78ed8b60cfaa28 upstream.

    The previous fix of pxa library support, which was introduced to fix the
    library dependency, broke the previous SoC behavior, where a machine
    code binding pxa2xx-ac97 with a coded relied on :
    - sound/soc/pxa/pxa2xx-ac97.c
    - sound/soc/codecs/XXX.c

    For example, the mioa701_wm9713.c machine code is currently broken. The
    "select ARM" statement wrongly selects the soc/arm/pxa2xx-ac97 for
    compilation, as per an unfortunate fate SND_PXA2XX_AC97 is both declared
    in sound/arm/Kconfig and sound/soc/pxa/Kconfig.

    Fix this by ensuring that SND_PXA2XX_SOC correctly triggers the correct
    pxa2xx-ac97 compilation.

    Fixes: 846172dfe33c ("ASoC: fix SND_PXA2XX_LIB Kconfig warning")
    Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    sound/arm/Kconfig | 15 ++++++++-------
    sound/soc/pxa/Kconfig | 2 --
    2 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
    index 885683a..e040621 100644
    --- a/sound/arm/Kconfig
    +++ b/sound/arm/Kconfig
    @@ -9,6 +9,14 @@ menuconfig SND_ARM
    Drivers that are implemented on ASoC can be found in
    "ALSA for SoC audio support" section.

    +config SND_PXA2XX_LIB
    + tristate
    + select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
    + select SND_DMAENGINE_PCM
    +
    +config SND_PXA2XX_LIB_AC97
    + bool
    +
    if SND_ARM

    config SND_ARMAACI
    @@ -21,13 +29,6 @@ config SND_PXA2XX_PCM
    tristate
    select SND_PCM

    -config SND_PXA2XX_LIB
    - tristate
    - select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
    -
    -config SND_PXA2XX_LIB_AC97
    - bool
    -
    config SND_PXA2XX_AC97
    tristate "AC97 driver for the Intel PXA2xx chip"
    depends on ARCH_PXA
    diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
    index a0f7d3c..23deb67 100644
    --- a/sound/soc/pxa/Kconfig
    +++ b/sound/soc/pxa/Kconfig
    @@ -1,7 +1,6 @@
    config SND_PXA2XX_SOC
    tristate "SoC Audio for the Intel PXA2xx chip"
    depends on ARCH_PXA
    - select SND_ARM
    select SND_PXA2XX_LIB
    help
    Say Y or M if you want to add support for codecs attached to
    @@ -15,7 +14,6 @@ config SND_PXA2XX_AC97
    config SND_PXA2XX_SOC_AC97
    tristate
    select AC97_BUS
    - select SND_ARM
    select SND_PXA2XX_LIB_AC97
    select SND_SOC_AC97_BUS

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-04-18 13:41    [W:4.072 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site