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: 128884 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4554806ljc; Tue, 20 Feb 2018 04:00:00 -0800 (PST) X-Google-Smtp-Source: AH8x2275qX9pj7TsA+NMt+D6H0aZ88rIEfz54hVVYi7ffNvopCX1XlAmvlu6AaV0f1KeHaML6Evf X-Received: by 10.101.76.143 with SMTP id m15mr15251036pgt.445.1519128000178; Tue, 20 Feb 2018 04:00:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519128000; cv=none; d=google.com; s=arc-20160816; b=fupejc2bTge2IrxWKqmKRyULHYWMo0lSZN07IMtr+e7srZXPFZ25YTTLHrfd8fAJox 1btQbH0V75lmstjyT0nDXvi8YEZcYuIm6Hq+A1RI8zqYAwE/dTqSlCYnR5RQrFBG8zxd Y2emK6d/yVUUGPqj67CYUy7jonEKJh6yB3siyIFZnfEjANNO3b/BztRjAlkxkNcnSe8o PczK54e9rbd0RdLQQ7Ro0z28ORiZmLgAcB2iK5tGMKMp3BfsnJ5QpUj8oWuAMUivp2dA 5HIxt4k24VHL7oXZyv+Olokr2O1eqIC65AYlvJVE9yxVsdEpChro9PMm344mVVTpDI5y mfNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0Yp9wLbDFpr71FOE0lz24WGMmXSOsBN7UdooN2sLTAE=; b=snRmqv6gEqYMy4gqKwU75GspF2a38INUY6/NpmXeg8PoeOEsWBHMOQZE5tjImwlOXA sKPf+ZhCe1KCYUba93HiTOxooje/tDOXyhmw37tMV4LnShIHcSjc9ZaGvsjZOsI0Of67 N2bn2odwNk5v+zWKejdb0YXkylgKCuOZAmzR56IYwCbUka3EXNK4DoCL21zuWch9ayHD HVE9nfNiqXCCxRApXGHvh7zcQ5bI3c/Aj8420qbQYlYlrFCp1C50PTtDeZwb67S4iZsa NxNPFjpg7OVx5WF4V985ziIpe3SHaZ0MPcSTMvr4LoRDOEI/A9HOydIXay/f201BEjAo 0MFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u19si5709827pfh.326.2018.02.20.03.59.59; Tue, 20 Feb 2018 04:00:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751961AbeBTL7y (ORCPT + 28 others); Tue, 20 Feb 2018 06:59:54 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:38843 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751450AbeBTL7u (ORCPT ); Tue, 20 Feb 2018 06:59:50 -0500 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 Cc: Greg KH , linux-kernel@vger.kernel.org, Vinod Koul , Mark Brown , Arnd Bergmann , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Subject: [4.4-stable 10/22] ASoC: Intel: Kconfig: fix build when ACPI is not enabled 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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