]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_ssm4567
authorVinod Koul <vinod.koul@intel.com>
Wed, 13 Jul 2016 16:43:43 +0000 (22:13 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 14 Jul 2016 16:21:29 +0000 (17:21 +0100)
The platform device id table expects names to be less that
20chars, so truncate the name in skl id table and
skl_nau88l25_ssm4567 machine.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/skl_nau88l25_ssm4567.c
sound/soc/intel/skylake/skl.c

index 22f2e9d84e72fade3a81bd3ca8a299e7d49bcf4c..3e67d7b31e2861513683bba01888d1a059083e56 100644 (file)
@@ -711,7 +711,7 @@ static int skylake_audio_probe(struct platform_device *pdev)
 static struct platform_driver skylake_audio = {
        .probe = skylake_audio_probe,
        .driver = {
-               .name = "skl_nau88l25_ssm4567_i2s",
+               .name = "skl_n88l25_s4567",
                .pm = &snd_soc_pm_ops,
        },
 };
@@ -726,4 +726,4 @@ MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>");
 MODULE_AUTHOR("Yong Zhi <yong.zhi@intel.com>");
 MODULE_DESCRIPTION("Intel Audio Machine driver for SKL with NAU88L25 and SSM4567 in I2S Mode");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:skl_nau88l25_ssm4567_i2s");
+MODULE_ALIAS("platform:skl_n88l25_s4567");
index 4e30effc5469e5ea0472c75f689786ebdb3f7ae5..0c46ee5f31dbe4e56ef461b31808134d66482034 100644 (file)
@@ -801,7 +801,7 @@ static void skl_remove(struct pci_dev *pci)
 
 static struct sst_acpi_mach sst_skl_devdata[] = {
        { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },
-       { "INT343B", "skl_nau88l25_ssm4567_i2s", "intel/dsp_fw_release.bin",
+       { "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",
                                NULL, NULL, &skl_dmic_data },
        { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin",
                                NULL, NULL, &skl_dmic_data },