diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:16:26 +0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:16:26 +0700 |
commit | df91a2100c05cec9323a222b97be918ccf53e378 (patch) | |
tree | 5902b152718a4a716848548909a1a049748b6950 /sound/soc/intel/atom/sst/sst_acpi.c | |
parent | a1eb30008c3bf540d15dfd891f306a144194ab9a (diff) | |
parent | e2304803fd05eac509c8e37bb626c192510e4e77 (diff) | |
download | linux-df91a2100c05cec9323a222b97be918ccf53e378.tar.bz2 |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/atom/sst/sst_acpi.c')
-rw-r--r-- | sound/soc/intel/atom/sst/sst_acpi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 4fce03fc1870..3bc4b63b2f9d 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -342,6 +342,10 @@ static struct sst_acpi_mach sst_acpi_chv[] = { &chv_platform_data }, {"193C9890", "cht-bsw-max98090", "intel/fw_sst_22a8.bin", "cht-bsw", NULL, &chv_platform_data }, + /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */ + {"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL, + &chv_platform_data }, + {}, }; |