diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-07-13 12:43:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-07-14 12:21:29 -0400 |
commit | a2f5b8db2e983e44cb0cd7e8e95135fc7c9b1394 (patch) | |
tree | d8304c98521d72091264f62d7a7fbfee6e847f14 /sound/soc/intel | |
parent | 400ada0c766b86b60313a68a3ad419558f1cbc5b (diff) |
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_max98357a
The platform device id table expects names to be less that
20chars, so truncate the name in skl id table and
skl_nau88l25_max98357a machine.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r-- | sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index afc6f744dff1..80efe5e32291 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c | |||
@@ -659,7 +659,7 @@ static int skylake_audio_probe(struct platform_device *pdev) | |||
659 | static struct platform_driver skylake_audio = { | 659 | static struct platform_driver skylake_audio = { |
660 | .probe = skylake_audio_probe, | 660 | .probe = skylake_audio_probe, |
661 | .driver = { | 661 | .driver = { |
662 | .name = "skl_nau88l25_max98357a_i2s", | 662 | .name = "skl_n88l25_m98357a", |
663 | .pm = &snd_soc_pm_ops, | 663 | .pm = &snd_soc_pm_ops, |
664 | }, | 664 | }, |
665 | }; | 665 | }; |
@@ -670,4 +670,4 @@ module_platform_driver(skylake_audio) | |||
670 | MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode"); | 670 | MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode"); |
671 | MODULE_AUTHOR("Rohit Ainapure <rohit.m.ainapure@intel.com"); | 671 | MODULE_AUTHOR("Rohit Ainapure <rohit.m.ainapure@intel.com"); |
672 | MODULE_LICENSE("GPL v2"); | 672 | MODULE_LICENSE("GPL v2"); |
673 | MODULE_ALIAS("platform:skl_nau88l25_max98357a_i2s"); | 673 | MODULE_ALIAS("platform:skl_n88l25_m98357a"); |
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 0c46ee5f31db..9f6733d72bde 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c | |||
@@ -803,7 +803,7 @@ static struct sst_acpi_mach sst_skl_devdata[] = { | |||
803 | { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, | 803 | { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, |
804 | { "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin", | 804 | { "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin", |
805 | NULL, NULL, &skl_dmic_data }, | 805 | NULL, NULL, &skl_dmic_data }, |
806 | { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", | 806 | { "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin", |
807 | NULL, NULL, &skl_dmic_data }, | 807 | NULL, NULL, &skl_dmic_data }, |
808 | {} | 808 | {} |
809 | }; | 809 | }; |