From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre-Louis Bossart Subject: [RFC PATCH 3/8] ASoC: ACPI: add new fields for SOF support Date: Fri, 8 Sep 2017 15:56:57 -0500 Message-ID: <20170908205702.1985-4-pierre-louis.bossart@linux.intel.com> References: <20170908205702.1985-1-pierre-louis.bossart@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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) In-Reply-To: <20170908205702.1985-1-pierre-louis.bossart@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, broonie@kernel.org, Pierre-Louis Bossart , vinod.koul@intel.com List-Id: alsa-devel@alsa-project.org 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 -- 2.9.3