From patchwork Wed Jun 17 16:56:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 192405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D59BEC433E0 for ; Wed, 17 Jun 2020 16:57:24 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FF5D2098B for ; Wed, 17 Jun 2020 16:57:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="nh8+uT+D" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FF5D2098B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D99601615; Wed, 17 Jun 2020 18:56:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D99601615 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1592413042; bh=r/qqcyowhoP0FhMZEeigl9CQLJtMHqH8vj6MhXsjv/I=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=nh8+uT+DA1QCFlonU6GZa/hzeVRgb2FzmnbfpRepXX2XEwT1w0JA41kW45d9C5Mvp 0bCfEaxO51dHzWhN6TX3jB2pWJfZ1f1B3aVKkWaffrpB6I8/Zo6V9byHtVWW82pRJG fmcWaH+12Zy+Krj9eJOhYfRB3NStbZ0N/D2hTvxQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 40B47F801EB; Wed, 17 Jun 2020 18:56:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 43A9CF801ED; Wed, 17 Jun 2020 18:56:30 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A6143F80162 for ; Wed, 17 Jun 2020 18:56:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6143F80162 IronPort-SDR: OSFylSCeEC/BT7xhqERWQXKszh7GB84vUeF7YRNiliV6aB+Qa0FBsRNUzJhWklFW9ZAFBKqcui Gs6vm2XNpltQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 09:56:22 -0700 IronPort-SDR: w4MOacDebxULyK0gdS+LNAwB92WqpvRm+w2G8EbNFASwT1z6mPcRFOYpLEP7G2t8Qj1/G5ce5a xdsEzOwiuvmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,523,1583222400"; d="scan'208";a="277339139" Received: from zdsmith-mobl2.amr.corp.intel.com (HELO pbossart-mobl3.amr.corp.intel.com) ([10.255.229.128]) by orsmga006.jf.intel.com with ESMTP; 17 Jun 2020 09:56:21 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Subject: [PATCH RESEND 0/3] ASoC: Intel: simplify driver/card names for SOF/UCM integration Date: Wed, 17 Jun 2020 11:56:13 -0500 Message-Id: <20200617165616.18511-1-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" As suggested by Jaroslav, this patchset simplifies legacy cards compiled with SOF: they now expose an 'SOF' driver name and an 'sof-bytcht ' card name. UCM uses this driver name and additionally checks for the card name to load a configuration shared with the SST driver. This patchset is just a rename with no functionality change. There is no modification when SOF is not used, and Kconfig for SOF are disabled when SST is enabled so no risk of interference. This helps make 5.9 the first kernel version where SOF 'just works'(tm) on legacy platforms with no additional configuration needed (as is already the case with more recent HDaudio+DMIC platforms). Thanks to Jaroslav for all the hard work on the alsa-lib/UCM side (the majority of the configs are already merged in alsa-ucm-conf, only minor updates are in-flight for max98090 and broadwell). Patches sent initially on May 29, probably missed with the merge window. No changes except for the addition of Jaroslav's Reviewed-by tag. Pierre-Louis Bossart (3): ASoC: Intel: byt*: simplify card names for SOF uses ASoC: Intel: cht*: simplify card names for SOF uses ASoC: Intel: broadwell: simplify card names for SOF uses sound/soc/intel/boards/bdw-rt5650.c | 12 +++++++++++- sound/soc/intel/boards/bdw-rt5677.c | 12 +++++++++++- sound/soc/intel/boards/broadwell.c | 12 +++++++++++- sound/soc/intel/boards/bytcht_cx2072x.c | 12 +++++++++++- sound/soc/intel/boards/bytcht_da7213.c | 12 +++++++++++- sound/soc/intel/boards/bytcht_es8316.c | 12 +++++++++++- sound/soc/intel/boards/bytcr_rt5640.c | 12 +++++++++++- sound/soc/intel/boards/bytcr_rt5651.c | 12 +++++++++++- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 +++++++++++- sound/soc/intel/boards/cht_bsw_nau8824.c | 12 +++++++++++- sound/soc/intel/boards/cht_bsw_rt5645.c | 17 +++++++++++++++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 12 +++++++++++- 12 files changed, 136 insertions(+), 13 deletions(-)