lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 077/267] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency, again
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit 0574eab363ace70ef275d4caad6eadc458d33728 upstream.

    I tried to fix this before and submitted a working patch, but after
    some discussion we came up with what seemed to be a nicer solution,
    resulting in commit 3d4cf65e2d ("ASoC: omap: fix up
    SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency"). Unfortunately, that
    version was incomplete, and we still get this build error:

    drivers/clk/clk-palmas.c:46:16: error: field 'hw' has incomplete type
    drivers/clk/clk-palmas.c: In function 'to_palmas_clks_info':
    drivers/clk/clk-palmas.c:54:74: warning: initialization from incompatible pointer type [-Winc

    This happens only in randconfig builds that turn on MFD_PALMAS
    on a platform other than OMAP2+ when COMPILE_TEST is set
    but COMMON_CLK is not.

    The new approach is only 'select COMMON_CLK_PALMAS' if we know
    that we are on an OMAP5 platform and MFD_PALMAS is already set.
    This patch has survived thousands of randconfig builds and I
    don't see a remaining hole in the logic.

    Fixes: 3d4cf65e2d ("ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/omap/Kconfig | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/sound/soc/omap/Kconfig
    +++ b/sound/soc/omap/Kconfig
    @@ -100,12 +100,13 @@ config SND_OMAP_SOC_OMAP_TWL4030

    config SND_OMAP_SOC_OMAP_ABE_TWL6040
    tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
    - depends on TWL6040_CORE && SND_OMAP_SOC && (ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST)
    + depends on TWL6040_CORE && SND_OMAP_SOC
    + depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
    select SND_OMAP_SOC_DMIC
    select SND_OMAP_SOC_MCPDM
    select SND_SOC_TWL6040
    select SND_SOC_DMIC
    - select COMMON_CLK_PALMAS if MFD_PALMAS
    + select COMMON_CLK_PALMAS if (SOC_OMAP5 && MFD_PALMAS)
    help
    Say Y if you want to add support for SoC audio on OMAP boards using
    ABE and twl6040 codec. This driver currently supports:



    \
     
     \ /
      Last update: 2015-08-01 00:01    [W:4.030 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site