aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Manohar <[email protected]>2018-06-18 13:29:35 -0500
committerMark Brown <[email protected]>2018-06-19 15:46:53 +0100
commit95555f580dca21fac5ea35c10fa92fa034bd403f (patch)
tree0eb50d286d776a0892678f727d27cde1de6d5ed4
parent5fd46e649ee63259f2197625662477ac67a69e79 (diff)
ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a
Use truncated names in bxt id table and bxt_da7219_max98357a machine as platform device id table expects names to be less then 20chars. Signed-off-by: Naveen Manohar <[email protected]> Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Mark Brown <[email protected]>
-rw-r--r--sound/soc/intel/boards/bxt_da7219_max98357a.c4
-rw-r--r--sound/soc/intel/skylake/skl.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 40eb979d5ac1..3aba5bcf806a 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -586,7 +586,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
static struct platform_driver broxton_audio = {
.probe = broxton_audio_probe,
.driver = {
- .name = "bxt_da7219_max98357a_i2s",
+ .name = "bxt_da7219_max98357a",
.pm = &snd_soc_pm_ops,
},
};
@@ -599,4 +599,4 @@ MODULE_AUTHOR("Rohit Ainapure <[email protected]>");
MODULE_AUTHOR("Harsha Priya <[email protected]>");
MODULE_AUTHOR("Conrad Cooke <[email protected]>");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:bxt_da7219_max98357a_i2s");
+MODULE_ALIAS("platform:bxt_da7219_max98357a");
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index f0d9793f872a..0a8f0768e987 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -1093,7 +1093,7 @@ static struct snd_soc_acpi_mach sst_bxtp_devdata[] = {
},
{
.id = "DLGS7219",
- .drv_name = "bxt_da7219_max98357a_i2s",
+ .drv_name = "bxt_da7219_max98357a",
.fw_filename = "intel/dsp_fw_bxtn.bin",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &bxt_codecs,