Ignore:
Timestamp:
Apr 21, 2017, 4:28:29 AM (5 weeks ago)
Author:
brainslayer
Message:

update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/sound/soc/intel/Kconfig

    r31574 r31885  
    3434        depends on (X86 || COMPILE_TEST)
    3535
    36 # firmware stuff depends DW_DMAC_CORE; since there is no depends-on from
    37 # the reverse selection, each machine driver needs to select
    38 # SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE
    3936config SND_SOC_INTEL_SST_FIRMWARE
    4037        tristate
     38        select DW_DMAC_CORE
    4139
    4240config SND_SOC_INTEL_SST_ACPI
     
    4846config SND_SOC_INTEL_HASWELL
    4947        tristate
     48        select SND_SOC_INTEL_SST
    5049        select SND_SOC_INTEL_SST_FIRMWARE
    5150
    5251config SND_SOC_INTEL_BAYTRAIL
    5352        tristate
     53        select SND_SOC_INTEL_SST
     54        select SND_SOC_INTEL_SST_FIRMWARE
    5455
    5556config SND_SOC_INTEL_HASWELL_MACH
    5657        tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
    5758        depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
    58         depends on DW_DMAC_CORE
    59         select SND_SOC_INTEL_SST
     59        depends on DMADEVICES
    6060        select SND_SOC_INTEL_HASWELL
    6161        select SND_SOC_RT5640
     
    100100        tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
    101101        depends on X86_INTEL_LPSS && I2C
    102         depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n)
    103         select SND_SOC_INTEL_SST
    104         select SND_SOC_INTEL_SST_FIRMWARE
     102        depends on DMADEVICES
     103        depends on SND_SST_IPC_ACPI = n
    105104        select SND_SOC_INTEL_BAYTRAIL
    106105        select SND_SOC_RT5640
     
    113112        tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
    114113        depends on X86_INTEL_LPSS && I2C
    115         depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n)
    116         select SND_SOC_INTEL_SST
    117         select SND_SOC_INTEL_SST_FIRMWARE
     114        depends on DMADEVICES
     115        depends on SND_SST_IPC_ACPI = n
    118116        select SND_SOC_INTEL_BAYTRAIL
    119117        select SND_SOC_MAX98090
     
    124122config SND_SOC_INTEL_BDW_RT5677_MACH
    125123        tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
    126         depends on X86_INTEL_LPSS && GPIOLIB && I2C && DW_DMAC
    127         depends on DW_DMAC_CORE=y
    128         select SND_SOC_INTEL_SST
     124        depends on X86_INTEL_LPSS && GPIOLIB && I2C
     125        depends on DMADEVICES
    129126        select SND_SOC_INTEL_HASWELL
    130127        select SND_SOC_RT5677
     
    135132config SND_SOC_INTEL_BROADWELL_MACH
    136133        tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
    137         depends on X86_INTEL_LPSS && I2C && DW_DMAC && \
    138                    I2C_DESIGNWARE_PLATFORM
    139         depends on DW_DMAC_CORE
    140         select SND_SOC_INTEL_SST
     134        depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
     135        depends on DMADEVICES
    141136        select SND_SOC_INTEL_HASWELL
    142137        select SND_SOC_RT286
Note: See TracChangeset for help on using the changeset viewer.