lkml.org 
[lkml]   [2017]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] ASoC: Intel: Fix nested/unnecessary Kconfig dependencies
    Date
    This patch fixes a number of issues:
    1. IOSF_MBI is only needed for byt-cr detection, which is only supported
    on Baytrail/Cherrytrail, move to HiFi2 config

    2. SND_SOC_INTEL_SST should not select SND_SOC_INTEL_SST_ACPI, the latter
    config is only valid for Haswell/Baytrail legacy but not needed by Skylake

    3. SND_SST_IPC_ACPI, used only by the atom/sst driver, should not select
    SND_SOC_INTEL_SST, none of the code under common/sst*.c is used

    This nesting of configs really makes no sense, it's easier to maintain
    if for each platform one can control what is strictly required.

    Compiled-tested with each of Haswell, Baytrail legacy, HiFi2, SKL cases
    selected independently. 0-day and explicit randconfig tests did not report
    additional issues and no functionality loss was observed in Intel tests on
    HIFI2 and SKYLAKE platforms

    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    ---
    sound/soc/intel/Kconfig | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
    index f25edeb7cff6..e6f7fc91900c 100644
    --- a/sound/soc/intel/Kconfig
    +++ b/sound/soc/intel/Kconfig
    @@ -27,8 +27,6 @@ config SND_SST_IPC_PCI
    config SND_SST_IPC_ACPI
    tristate
    select SND_SST_IPC
    - select SND_SOC_INTEL_SST
    - select IOSF_MBI
    # This option controls the ACPI-based IPC for HiFi2 platforms
    # (Baytrail, Cherrytrail)

    @@ -39,7 +37,6 @@ config SND_SOC_INTEL_SST_ACPI

    config SND_SOC_INTEL_SST
    tristate
    - select SND_SOC_INTEL_SST_ACPI if ACPI

    config SND_SOC_INTEL_SST_FIRMWARE
    tristate
    @@ -52,6 +49,7 @@ config SND_SOC_INTEL_HASWELL
    depends on SND_DMA_SGBUF && ACPI
    depends on DMADEVICES
    select SND_SOC_INTEL_SST
    + select SND_SOC_INTEL_SST_ACPI
    select SND_SOC_INTEL_SST_FIRMWARE
    select SND_SOC_ACPI_INTEL_MATCH
    help
    @@ -63,6 +61,7 @@ config SND_SOC_INTEL_BAYTRAIL
    tristate "Intel ASoC SST driver for Baytrail (legacy)"
    depends on DMADEVICES && ACPI
    select SND_SOC_INTEL_SST
    + select SND_SOC_INTEL_SST_ACPI
    select SND_SOC_INTEL_SST_FIRMWARE
    select SND_SOC_ACPI_INTEL_MATCH
    help
    @@ -89,6 +88,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM
    tristate "Intel ASoC SST driver for ACPI HiFi2 platforms (Baytrail, Cherrytrail)"
    depends on X86 && ACPI
    select SND_SST_IPC_ACPI
    + select IOSF_MBI
    select SND_SOC_COMPRESS
    select SND_SOC_ACPI_INTEL_MATCH
    help
    --
    2.14.1
    \
     
     \ /
      Last update: 2017-12-15 01:47    [W:4.109 / U:0.964 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site