Received: by 10.213.65.68 with SMTP id h4csp2588284imn; Mon, 2 Apr 2018 10:11:36 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/4cK6MOGRQCYp1uZA7+fGPRU8bwif9kZyqu48DVeeiYut22rt/OiMYnCooAbVqnor+3DS4 X-Received: by 10.99.100.6 with SMTP id y6mr6798513pgb.254.1522689096574; Mon, 02 Apr 2018 10:11:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522689096; cv=none; d=google.com; s=arc-20160816; b=YpuEBeq2Rn3bDOsJSmrlVw3lFC/Nbcg5eLUAuk7nFnOAEwveNXzHKydiIjzl3wVDR9 9Nnho7BmOUYO0S84l+CAI+jF5SvvG+jssfB9dHZtVjTvvdihTM6HupX6tTeuF8rQR60l Tg7oEwipLZCFLo2O52UhMGilgz0alJqsUslJ2c+QQ6vRZD9RYTuxoXrMoGFnGdR2QuVJ hSZXdeOBsHaKCQkJcldF6b0Q61KflD77RgmLrdsJuRCg8iDAoJOWJnPgjGHk5Kdw9bh1 oaR2yIkx/lKw7YIB5bb89P01Fjh3Lc+6rxnvI3RPn/u+TO0iOl6l2NvqW5DnlzsWjI1B HahA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=mQSljno5oHsKKYX/XAUkeDVxRW3Jrc96deXjvfl0N94=; b=BkCzqDspbgmbTkgAJMQU484RsRwmw5J+IP3oig18XPsjgTyLXSkNUPB7cC0u/VjYvD yuDXpGk9+VpUM7nDtKPGiUHlSCPeV/ojqfVlFsrJSdx+wYDGkDm/0tQ9B+ZMA+iKKubr b3VgHif8JCG1o9A9SEHx7ofJXmNdDxiTQLfP+K79poFc6ANzA2XnI3KJ3lj7H4UYQwZA BghE27PUeGp4I8gbrQB1gICfUUFGuOftlr6yFqcYUxMeya8avIxuP3PFYrnOA5oefNST HgsdXkb6v7wI8wXcwpw/MraU2ON8ucIijNzu99Nc2G2x8ay82IUGjHX3rgYbgOaxer1Q 1BmA== 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 r11si547348pff.160.2018.04.02.10.11.22; Mon, 02 Apr 2018 10:11:36 -0700 (PDT) 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 S1753146AbeDBRKC (ORCPT + 99 others); Mon, 2 Apr 2018 13:10:02 -0400 Received: from mga11.intel.com ([192.55.52.93]:42817 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753081AbeDBRKA (ORCPT ); Mon, 2 Apr 2018 13:10:00 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2018 10:06:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,396,1517904000"; d="scan'208";a="43382186" Received: from rbangin-mobl.gar.corp.intel.com (HELO localhost.localdomain) ([10.249.2.114]) by fmsmga001.fm.intel.com with ESMTP; 02 Apr 2018 10:06:39 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: Arnd Bergmann , Mark Brown , Andy Shevchenko , liam.r.girdwood@linux.intel.com, Vinod Koul , linux-kernel@vger.kernel.org, Takashi Iwai , Harsha Priya N , Naveen M , Daniel Drake , Pierre-Louis Bossart Subject: [PATCH][RESEND] ASoC: Intel: atom: fix ACPI/PCI Kconfig Date: Mon, 2 Apr 2018 12:06:14 -0500 Message-Id: <20180402170614.5599-1-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The split between ACPI and PCI platforms generated issues with randconfig: with SND_SST_ATOM_HIFI2_PLATFORM_PCI=y and SND_SST_ATOM_HIFI2_PLATFORM=m, we get this module link failure: ERROR: "sst_context_init" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_context_cleanup" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_alloc_drv_context" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "intel_sst_pm" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_configure_runtime_pm" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! To keep things simple, let's expose two configs for SND_SST_ATOM_HIFI2_PLATFORM_PCI and SND_SST_ATOM_HIFI2_PLATFORM_ACPI, which select a common SND_SST_ATOM_HIFI2_PLATFORM option. To avoid breaking existing solutions with the semantics change, SND_SST_ATOM_HIFI2_PLATFORM_ACPI uses "default ACPI" so that "make oldnoconfig" and "make olddefconfig" still work as expected. Also remove mentions of Medfield while we are at it since it was removed recently. Reported-by: Arnd Bergmann Fixes: 4772c16ede52 ("ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies") Signed-off-by: Pierre-Louis Bossart --- already sent on January 23 but apparently missed sound/soc/intel/Kconfig | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ceb105cbd461..addac2a8e52a 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -72,24 +72,28 @@ config SND_SOC_INTEL_BAYTRAIL for Baytrail Chromebooks but this option is now deprecated and is not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead. +config SND_SST_ATOM_HIFI2_PLATFORM + tristate + select SND_SOC_COMPRESS + config SND_SST_ATOM_HIFI2_PLATFORM_PCI - tristate "PCI HiFi2 (Medfield, Merrifield) Platforms" + tristate "PCI HiFi2 (Merrifield) Platforms" depends on X86 && PCI select SND_SST_IPC_PCI - select SND_SOC_COMPRESS + select SND_SST_ATOM_HIFI2_PLATFORM help - If you have a Intel Medfield or Merrifield/Edison platform, then + If you have a Intel Merrifield/Edison platform, then enable this option by saying Y or m. Distros will typically not - enable this option: Medfield devices are not available to - developers and while Merrifield/Edison can run a mainline kernel with - limited functionality it will require a firmware file which - is not in the standard firmware tree + enable this option: while Merrifield/Edison can run a mainline + kernel with limited functionality it will require a firmware file + which is not in the standard firmware tree -config SND_SST_ATOM_HIFI2_PLATFORM +config SND_SST_ATOM_HIFI2_PLATFORM_ACPI tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms" + default ACPI depends on X86 && ACPI select SND_SST_IPC_ACPI - select SND_SOC_COMPRESS + select SND_SST_ATOM_HIFI2_PLATFORM select SND_SOC_ACPI_INTEL_MATCH select IOSF_MBI help -- 2.14.1