From patchwork Tue Feb 20 11:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10229859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D53C602B1 for ; Tue, 20 Feb 2018 11:59:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AE0328602 for ; Tue, 20 Feb 2018 11:59:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D6D62860B; Tue, 20 Feb 2018 11:59:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CD4128607 for ; Tue, 20 Feb 2018 11:59:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D7E2F267079; Tue, 20 Feb 2018 12:59:15 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3FB47267505; Tue, 20 Feb 2018 12:59:14 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by alsa0.perex.cz (Postfix) with ESMTP id D9455266F0D for ; Tue, 20 Feb 2018 12:59:11 +0100 (CET) Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LgosA-1eRk8518Ew-00oFbX; Tue, 20 Feb 2018 12:58:59 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Date: Tue, 20 Feb 2018 12:54:57 +0100 Message-Id: <20180220115527.1806578-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:+OGUARZvbYaC61ThZMhc0pohW4ZOlbZQTsUpwbQCZDBN3j5JN1R eOzhxO/zIGB6b7+jiiySKXXBWhx1b0w9ryWyAzr8tk1277zvDvU2Y/nBt6SSCSzuOR2ciGz WHDJl5yl+HP0Z/nfFhcEffUNd2u5wklV0u+K2d16a1IqP1iowYbuwjxCZEaEQP2z9zzj745 0CMAnc7Um2L/7FO1fedDA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+XuUA9Rv3+0=:4D1gNETQp8DqiKbRqWW4/p /Uo/UnxipSUi7IqzIm+LlUYSamP+RghEifOUetC0dWyjS++RmoTccMG38Ieffzk3is2RM2QNQ zzhu1h39hhf4Zu/4r1rNMw2cKzZM28GpjuwB9oZm6GcDmf90MGRi+D2km1SLNM3guEAZg0Jkc OlaSw+4o+DCB2Dg8JIH+Nvzj56wlb7vgNX8srvoWc6YrTmLo65NljwUdjTGnEY+3vyB230C84 1y0v57YRVJ0pYPlJfAAh1gU1wKm10q+BOh3n6EsR3fYBPlVk1Pe3DIK64de/SoZTIbrRhzVtr oWAWMSrc5VH2K/rW5/UTamh0fbz1IurPqTVTOkk7jWiUnoi6LnHgCexHiO/59figsf9nIq1c5 Nq6PIyZg0Lx6K5SFJQo3YOvkxNQFGzBuqB22X8AOOSWqWevtK6LRjNOJfe6MRZBI576hFkrI0 M7AjNjdPoKSz/F/CfUUJ/QAJO2ed0MEQpMcXxekZA+AuWZRK1d+H8bx7wn9NQY60X2XXMJCA/ vt70OEWtxozDprrfIPNc9JjBG6GNS6O+r+yTWt6vKuhybq/dhjozXGpecjs/X7BXHPhUZXDlF gChDSS0xUVYeEyw6+9l/kj2joSxX6RB7tSxMG3dHT6ompsxU6ssmWIqia/flSZvzU9GEZx3yR ExGdWE4HiW7S2x0DVl7pgRVUQaeRB49tCnROwhsonuzevnkgW4HlzZm1s/uHCI++dO/X0pbCf 8/sXgAqG8vnUBW3rC4RNCAJkjRbOoRrg/h7nVg== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Vinod Koul , Greg KH , Takashi Iwai , linux-kernel@vger.kernel.org, Liam Girdwood , Mark Brown Subject: [alsa-devel] [4.4-stable 10/22] ASoC: Intel: Kconfig: fix build when ACPI is not enabled X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Vinod Koul commit 3493d4a86457c7de9f1e602b4267c9b0f9ec1c9f upstream. Randy reported following error when ACPI is not enabled: warning: (SND_SOC_INTEL_BYTCR_RT5640_MACH && SND_SOC_INTEL_BYTCR_RT5651_MACH && SND_SOC_INTEL_CHT_BSW_RT5672_MACH && SND_SOC_INTEL_CHT_BSW_RT5645_MACH && SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) selects SND_SST_IPC_ACPI +which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && ACPI) causing these build errors: In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:40:0: ../include/acpi/acpi_bus.h:65:20: error: conflicting types for 'acpi_evaluate_dsm' union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:31:0: ../include/linux/acpi.h:676:34: note: previous definition of 'acpi_evaluate_dsm' was here static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, CONFIG_SND_SST_IPC_ACPI was already dependent upon ACPI, but that was not solving it. So move the depends up to machine drivers and remove from CONFIG_SND_SST_IPC_ACPI. Reported-by: Randy Dunlap Signed-off-by: Vinod Koul Signed-off-by: Mark Brown [arnd: rebased to 4.4-stable kernel] Signed-off-by: Arnd Bergmann --- sound/soc/intel/Kconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index d430ef5a4f38..79c29330c56a 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -24,7 +24,6 @@ config SND_SST_IPC_PCI config SND_SST_IPC_ACPI tristate select SND_SST_IPC - depends on ACPI config SND_SOC_INTEL_SST tristate @@ -91,7 +90,7 @@ config SND_SOC_INTEL_BROADWELL_MACH config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio DSP Support for MID BYT Platform" - depends on X86 && I2C + depends on X86 && I2C && ACPI select SND_SOC_RT5640 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI @@ -103,7 +102,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH config SND_SOC_INTEL_CHT_BSW_RT5672_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on X86_INTEL_LPSS && I2C + depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5670 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI @@ -115,7 +114,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH config SND_SOC_INTEL_CHT_BSW_RT5645_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" - depends on X86_INTEL_LPSS && I2C + depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5645 select SND_SST_MFLD_PLATFORM select SND_SST_IPC_ACPI