diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-11-05 21:34:12 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-16 10:08:09 +0000 |
| commit | 12cc291b0b58503b3b0e629ac605218df1851ce1 (patch) | |
| tree | 636ae9c2d80b37b54d1e0363dba1a146f149997a /sound/soc/intel/common | |
| parent | 95f098014815b330838b1173d3d7bcea3b481242 (diff) | |
| download | talos-op-linux-12cc291b0b58503b3b0e629ac605218df1851ce1.tar.gz talos-op-linux-12cc291b0b58503b3b0e629ac605218df1851ce1.zip | |
ASoC: Intel: Atom: move atom driver to common acpi match
This patch moves the atom driver to use the common acpi match
functions. Since atom driver has few more information in machine
table, these are appended to table and set to NULL for common
driver
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common')
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.c | 8 | ||||
| -rw-r--r-- | sound/soc/intel/common/sst-acpi.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index 94a43e6fcf88..7a85c576dad3 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c @@ -180,7 +180,7 @@ static int sst_acpi_remove(struct platform_device *pdev) } static struct sst_acpi_mach haswell_machines[] = { - { "INT33CA", "haswell-audio", "intel/IntcSST1.bin" }, + { "INT33CA", "haswell-audio", "intel/IntcSST1.bin", NULL, NULL, NULL }, {} }; @@ -198,7 +198,7 @@ static struct sst_acpi_desc sst_acpi_haswell_desc = { }; static struct sst_acpi_mach broadwell_machines[] = { - { "INT343A", "broadwell-audio", "intel/IntcSST2.bin" }, + { "INT343A", "broadwell-audio", "intel/IntcSST2.bin", NULL, NULL, NULL }, {} }; @@ -216,8 +216,8 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { }; static struct sst_acpi_mach baytrail_machines[] = { - { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master" }, - { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master" }, + { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, + { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master", NULL, NULL, NULL }, {} }; diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h index 1dc059590ead..3ee3b7ab5d03 100644 --- a/sound/soc/intel/common/sst-acpi.h +++ b/sound/soc/intel/common/sst-acpi.h @@ -25,4 +25,9 @@ struct sst_acpi_mach { const char *drv_name; /* firmware file name */ const char *fw_filename; + + /* board name */ + const char *board; + void (*machine_quirk)(void); + void *pdata; }; |
