Unverified Commit 78f0ecf3 authored by Mark Brown's avatar Mark Brown
Browse files

Introduce sof_of_machine_select 

Merge series from Chunxu Li <chunxu.li@mediatek.com>:

In these patches, we introduce function sof_of_machine_select for SOF
parents 88630575 2dec9e09

include/sound/sof.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct snd_sof_pdata { 
	/* machine */

	struct platform_device *pdev_mach;

	const struct snd_soc_acpi_mach *machine;

	const struct snd_sof_of_mach *of_machine;



	void *hw_pdata;
@@ -102,6 +103,7 @@ struct snd_sof_pdata { 
struct sof_dev_desc {

	/* list of machines using this configuration */

	struct snd_soc_acpi_mach *machines;

	struct snd_sof_of_mach *of_machines;



	/* alternate list of machines using this configuration */

	struct snd_soc_acpi_mach *alt_machines;

sound/soc/sof/mediatek/mt8186/mt8186.c

+9 −0
Original line number Diff line number Diff line
@@ -515,7 +515,16 @@ static struct snd_sof_dsp_ops sof_mt8186_ops = { 
			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,

};



static struct snd_sof_of_mach sof_mt8186_machs[] = {

	{

		.compatible = "mediatek,mt8186",

		.sof_tplg_filename = "sof-mt8186.tplg",

	},

	{}

};



static const struct sof_dev_desc sof_of_mt8186_desc = {

	.of_machines = sof_mt8186_machs,

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

sound/soc/sof/pcm.c

+7 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/pm_runtime.h>

#include <sound/pcm_params.h>

#include <sound/sof.h>

#include "sof-of-dev.h"

#include "sof-priv.h"

#include "sof-audio.h"

#include "sof-utils.h"
@@ -655,7 +656,12 @@ void snd_sof_new_platform_drv(struct snd_sof_dev *sdev) 
	struct snd_sof_pdata *plat_data = sdev->pdata;

	const char *drv_name;



	if (plat_data->machine)

		drv_name = plat_data->machine->drv_name;

	else if (plat_data->of_machine)

		drv_name = plat_data->of_machine->drv_name;

	else

		drv_name = NULL;



	pd->name = "sof-audio-component";

	pd->probe = sof_pcm_probe;

sound/soc/sof/sof-audio.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/bitfield.h>

#include "sof-audio.h"

#include "sof-of-dev.h"

#include "ops.h"



static void sof_reset_route_setup_status(struct snd_sof_dev *sdev, struct snd_sof_widget *widget)

sound/soc/sof/sof-of-dev.h

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
#ifndef __SOUND_SOC_SOF_OF_H

#define __SOUND_SOC_SOF_OF_H



struct snd_sof_of_mach {

	const char *compatible;

	const char *drv_name;

	const char *fw_filename;

	const char *sof_tplg_filename;

};



extern const struct dev_pm_ops sof_of_pm;



int sof_of_probe(struct platform_device *pdev);