From patchwork Fri Sep 8 20:56:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 9945043 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 30755604D4 for ; Fri, 8 Sep 2017 20:58:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21CA228916 for ; Fri, 8 Sep 2017 20:58:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14EFF28919; Fri, 8 Sep 2017 20:58:12 +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 4BD7C28916 for ; Fri, 8 Sep 2017 20:58:11 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C54CE266E41; Fri, 8 Sep 2017 22:57:25 +0200 (CEST) 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 373352675B5; Fri, 8 Sep 2017 22:57:24 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by alsa0.perex.cz (Postfix) with ESMTP id BA1C3266E38 for ; Fri, 8 Sep 2017 22:57:17 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Sep 2017 13:57:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,363,1500966000"; d="scan'208";a="309635310" Received: from rkris16-mobl.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.249.11.178]) by fmsmga004.fm.intel.com with ESMTP; 08 Sep 2017 13:57:13 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Date: Fri, 8 Sep 2017 15:56:57 -0500 Message-Id: <20170908205702.1985-4-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170908205702.1985-1-pierre-louis.bossart@linux.intel.com> References: <20170908205702.1985-1-pierre-louis.bossart@linux.intel.com> Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, broonie@kernel.org, Pierre-Louis Bossart , vinod.koul@intel.com Subject: [alsa-devel] [RFC PATCH 3/8] ASoC: ACPI: add new fields for SOF support 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 To prepare for SOF integration, we need new fields in the machine table. It is intended that the same table is used for both closed-source and open-source firmware to avoid repeating ACPI-related information multiple times No functional change Signed-off-by: Pierre-Louis Bossart --- include/sound/soc-acpi.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 75fb32e..3e61f93 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -60,12 +60,29 @@ struct snd_soc_acpi_mach { const char *drv_name; /* firmware file name */ const char *fw_filename; - /* board name */ const char *board; struct snd_soc_acpi_mach * (*machine_quirk)(void *arg); const void *quirk_data; + + /* intended for platform data or machine specific-ops */ void *pdata; + + /* SOF firmware file name */ + const char *sof_fw_filename; + /* SOF default topology */ + const char *sof_tplg_filename; + + /* ASoC platform name - used for binding machine drivers if non NULL */ + const char *asoc_plat_name; + + /* machine driver private data fixup */ + struct platform_device * (*new_mach_data)(void *pdata); + + /* FIXME: is this needed, was only used for BYTCR-detection + int (*confirm_mach)(struct device *dev, + const struct sof_dev_desc **desc); + */ }; #define SND_SOC_ACPI_MAX_CODECS 3