Received: by 10.213.65.68 with SMTP id h4csp2604472imn; Mon, 2 Apr 2018 10:29:59 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/A6PPaAACorsgwQAqOn+7D12cI0yMpZMKuN6rIVJw03CgQAyyX5+xkJN/V26In7EcpCn0q X-Received: by 2002:a17:902:822:: with SMTP id 31-v6mr10953882plk.200.1522690199546; Mon, 02 Apr 2018 10:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522690199; cv=none; d=google.com; s=arc-20160816; b=QfbcFeAz6RJOD/r/iy9NZoD+xX0DhpQlxZFHtOa7vfcopL0d+Sj+tNr8GrR74hADSg OkHAstX4lcqCYvFTQn6AhPdZ25qinWq8s2QkGiN/GD2BHwFOEH9bm2ia+UbDCFcbddYN wYzyQAu1KXEtZxoyq1mL6lRWnTCs5D6Bg8tQcxwLdD3Ha0EHs0T4SN7iUM1Dft6jgBi1 7SUxGS2BNJDz0suXWXXBolhMl9aJ9fExY5QWMd/msJ2uIuJnKgz/FpbuJNbz084Q5CDU r+9711Yd9sRE4dc0sSl0yeRhkok07iR4yyUG+ihlOOw+I3/asqZOwY6pgUpJjl9SB0Lo TxdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:date:cc:to:from:subject :message-id:arc-authentication-results; bh=ZJ82vjPJGBAeUFau4+TOFwon2VbRQqCLysi9Tgq6yxg=; b=Lwr58KrWiXBk/DnBaFDoD1InX6/vLcX3bBRrZUzX/u9epyd5g+UBh2nt5yshNBGvUc ngEpSntDm0ng+Wt7LqTAQibmMlriY4OddMheoHyn7Nf6Y68pa2hZkN+WUTuwpfHqbZRX OgfYo+Nc4jazyqAjE/uUgUk8xKMvO3D6EdwGZrhDdor0kOFVjJFv0y3rhO90fxA3ozo1 JVo2C1CytmkZI9rhElelZevYA7/uhzgdWWEeCGYNdolpJCrkckea1SfElJoLCPCdUQ++ VorzejE/+fe8Y4QDwDbfnLWhvCCTQzM4oru+oUrhywCRbCKe7p/kA96tdNLmCMivUJiP O4Wg== 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 d16-v6si732502plr.581.2018.04.02.10.29.44; Mon, 02 Apr 2018 10:29:59 -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 S1753153AbeDBR2g (ORCPT + 99 others); Mon, 2 Apr 2018 13:28:36 -0400 Received: from mga09.intel.com ([134.134.136.24]:43247 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898AbeDBR2f (ORCPT ); Mon, 2 Apr 2018 13:28:35 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2018 10:28:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,396,1517904000"; d="scan'208";a="188042078" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.86]) by orsmga004.jf.intel.com with ESMTP; 02 Apr 2018 10:28:31 -0700 Message-ID: <1522690110.21176.202.camel@linux.intel.com> Subject: Re: [PATCH][RESEND] ASoC: Intel: atom: fix ACPI/PCI Kconfig From: Andy Shevchenko To: Pierre-Louis Bossart , alsa-devel@alsa-project.org Cc: Arnd Bergmann , Mark Brown , liam.r.girdwood@linux.intel.com, Vinod Koul , linux-kernel@vger.kernel.org, Takashi Iwai , Harsha Priya N , Naveen M , Daniel Drake Date: Mon, 02 Apr 2018 20:28:30 +0300 In-Reply-To: <20180402170614.5599-1-pierre-louis.bossart@linux.intel.com> References: <20180402170614.5599-1-pierre-louis.bossart@linux.intel.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.5-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2018-04-02 at 12:06 -0500, Pierre-Louis Bossart wrote: > 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. > Assuming we will see no more kbuild bot complains, Reviewed-by: Andy Shevchenko > Reported-by: Arnd Bergmann > Fixes: 4772c16ede52 ("ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI > dependencies") > Signed-off-by: Pierre-Louis Bossart com> > --- > 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 -- Andy Shevchenko Intel Finland Oy