From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbdKHNGK (ORCPT ); Wed, 8 Nov 2017 08:06:10 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56202 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752467AbdKHNGH (ORCPT ); Wed, 8 Nov 2017 08:06:07 -0500 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vinod Koul , Pierre-Louis Bossart , Andy Shevchenko , Harsha Priya N , Daniel Drake , Naveen M , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ASoC: Intel: improve DMADEVICES dependency Date: Wed, 8 Nov 2017 14:03:19 +0100 Message-Id: <20171108130354.86106-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oUyz3Z/Bd+oZxLxJHFPtT/9sKoNcJFnZRG1+QGJN48gAqMrKdZX hCqER5d5trCpjWb7wMpR54mEroG1aIMZIiYnd+hHruZdFE8RXqthDQUN/Q85VrpVy8FhR7E RFkWygSLRc0dCKRCFjHF+/YwQ4wqjY8263VNuDgdH+dhk1VKnWEehaE/u5NRhbIXb3YypJF AK2wQeAA9TrCwh3+B5E+g== X-UI-Out-Filterresults: notjunk:1;V01:K0:itZqqUX5D8U=:i1v7gxEMrI9lyFRlPMfX1/ XhRL9DDbFn5yAmiIJjvJ053k9n/UhjQ/JVOtx1s77Lrp6g4/XYVaTKdfiVoiLuvBFWsAnRPnc XXH3mpAPC/FayMBv5naFmE7VHISklU8g2yfpC1CRmb0vKYTQJ52zmQRJWc1l0Yem+d6H8RvdD kgC9Twq0h9WyV3mxE7lqmHdZA8CujNov3WmJqaMrCvuAovh0MfKkdcEeN6wDoMMnVjwUL3jGE fmHNdklHGUylWcOqjasyl3yy/XXFNWV4vVirV5HGQ+hNBtFoNxcN2+OOB+oqnsLCXbIa964sy JkUByexHY5US0Zo8bCY69mnHleaxS6UcZrjj0nUXFLnzVnR0VtfYYEj3Fi9g/knTtaEMoydLX HUhz/R00Za0W2CkB4ISix6obXc3/aeSuDFs5WM/iH3yGSzhNBrsNJmY3ZvJ1HfrcIvQIKQmfX 53YfwyfEowhUj/6xFELK454b7WQVzFFgFwohed52QiL1dGn008LIvaNvaTO0jnhqWbN28N87P 73npK5pwlCPk4fOWMjjikHGOf6E0lqcLzQ/cVY9/38lrN2ko8VvFq+LZ7xqZ4sxswZr8s+CPq cm9UmDn67HV0CKTYQDDB0FvK/Pb8TYOiMLBfDcchso2V+nosyR3KhYpQ2bgL/Lc52UF1e2AVh SpwLLQqgySv2LPQqurSqvuYhljsjlGECdpw5WlwYbsZISBx7PrOZ6WLCvBrr9+RlYpQod3oM6 +IppbZD8wxL7VDUPGtajzfWtqmFL6jVWsZ+fzg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As pointed out by Pierre-Louis Bossart, the depndency I added was broader than necessary, only Baytrail and Haswell/Broadwell actually need it, the others don't. At the same time, we have individual entries for the codecs that all have the 'select' statement but now don't need it any more. Fixes: f7a88db6fffd ("ASoC: Intel: fix Kconfig dependencies") Signed-off-by: Arnd Bergmann --- sound/soc/intel/Kconfig | 3 ++- sound/soc/intel/boards/Kconfig | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index e18118209b75..bb8be10b8437 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -32,19 +32,20 @@ config SND_SOC_ACPI_INTEL_MATCH config SND_SOC_INTEL_SST_TOPLEVEL tristate "Intel ASoC SST drivers" depends on X86 || COMPILE_TEST - depends on DMADEVICES select SND_SOC_INTEL_MACH select SND_SOC_INTEL_COMMON config SND_SOC_INTEL_HASWELL tristate "Intel ASoC SST driver for Haswell/Broadwell" depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF + depends on DMADEVICES select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL tristate "Intel ASoC SST driver for Baytrail (legacy)" depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on DMADEVICES select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 449bc8baaa60..5063f15b4ca4 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -19,7 +19,6 @@ config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -32,7 +31,6 @@ config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && GPIOLIB && I2C - depends on DMADEVICES depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT5677 help @@ -43,7 +41,6 @@ config SND_SOC_INTEL_BROADWELL_MACH tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DMADEVICES depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help @@ -56,7 +53,6 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES depends on SND_SST_IPC_ACPI = n depends on SND_SOC_INTEL_BAYTRAIL select SND_SOC_MAX98090 @@ -68,7 +64,6 @@ config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C - depends on DMADEVICES depends on SND_SST_IPC_ACPI = n depends on SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5640 -- 2.9.0