ASoC: Intel: More Kabylake machine support
Subsystems (3)
cover ASoC: Intel: More Kabylake machine support
We have two more kbl machines, one with nau88l25_ssm4567 and second one with nau88l25_max98357a. This is similar to skylake which had the same combinations.
To add kbl IDs to existing machines we need to add names in id table. But current names are more than 20 characters which is limit for platform device id name names. So first truncate skl machines to less than 20 chars and then add new kbl names.
Vinod Koul (5):
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_ssm4567
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_max98357a
ASoC: Intel: Kbl: add kabylake additional machine entries
ASoC: Intel: board: add kabylake nau88l25_max98357a machine id
ASoC: Intel: board: add kabylake nau88l25_ssm4567 machine id
sound/soc/intel/boards/skl_nau88l25_max98357a.c | 12 ++++++++++-- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 12 ++++++++++-- sound/soc/intel/skylake/skl.c | 6 ++++-- 3 files changed, 24 insertions(+), 6 deletions(-)
Thanks
Signature · 1 line
~Vinod
PATCH 1/5 ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_ssm4567
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.
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 ++-- sound/soc/intel/skylake/skl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +2 -2
@@ -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 <[email protected]>");MODULE_AUTHOR ("Yong Zhi <[email protected]>" );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" );
sound/soc/intel/skylake/skl.c +1 -1
@@ -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 },
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_ssm4567" to the asoc tree
The patch
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_ssm4567
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
400ada0c766b86b60313a68a3ad419558f1cbc5bMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Wed, 13 Jul 2016 22:13:43 +0530
Subject: [PATCH] ASoC: Intel: Skylake: reduce machine name for
skl_nau88l25_ssm4567
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.
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 ++-- sound/soc/intel/skylake/skl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +2 -2
@@ -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 <[email protected]>");MODULE_AUTHOR ("Yong Zhi <[email protected]>" );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" );
sound/soc/intel/skylake/skl.c +1 -1
@@ -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 },
Signature · 1 line
2.8.1
PATCH 2/5 ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_max98357a
In reply to Vinod KoulThe platform device id table expects names to be less that 20chars, so truncate the name in skl id table and skl_nau88l25_max98357a machine.
--- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 ++-- sound/soc/intel/skylake/skl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/skl_nau88l25_max98357a.c +2 -2
@@ -659,7 +659,7 @@ static int skylake_audio_probe(struct platform_device *pdev)static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { - .name ="skl_nau88l25_max98357a_i2s" , + .name ="skl_n88l25_m98357a" , .pm = &snd_soc_pm_ops, }, };
@@ -670,4 +670,4 @@ module_platform_driver(skylake_audio)MODULE_DESCRIPTION ("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode" );MODULE_AUTHOR ("Rohit Ainapure <[email protected]" );MODULE_LICENSE ("GPL v2" ); -MODULE_ALIAS ("platform:skl_nau88l25_max98357a_i2s" ); +MODULE_ALIAS ("platform:skl_n88l25_m98357a" );
sound/soc/intel/skylake/skl.c +1 -1
@@ -803,7 +803,7 @@ static struct sst_acpi_mach sst_skl_devdata[] = { { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, { "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin", NULL, NULL, &skl_dmic_data }, - { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", + { "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin", NULL, NULL, &skl_dmic_data }, {} };
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_max98357a" to the asoc tree
The patch
ASoC: Intel: Skylake: reduce machine name for skl_nau88l25_max98357a
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
a2f5b8db2e983e44cb0cd7e8e95135fc7c9b1394Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Wed, 13 Jul 2016 22:13:44 +0530
Subject: [PATCH] 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.
--- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 ++-- sound/soc/intel/skylake/skl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/skl_nau88l25_max98357a.c +2 -2
@@ -659,7 +659,7 @@ static int skylake_audio_probe(struct platform_device *pdev)static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { - .name ="skl_nau88l25_max98357a_i2s" , + .name ="skl_n88l25_m98357a" , .pm = &snd_soc_pm_ops, }, };
@@ -670,4 +670,4 @@ module_platform_driver(skylake_audio)MODULE_DESCRIPTION ("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode" );MODULE_AUTHOR ("Rohit Ainapure <[email protected]" );MODULE_LICENSE ("GPL v2" ); -MODULE_ALIAS ("platform:skl_nau88l25_max98357a_i2s" ); +MODULE_ALIAS ("platform:skl_n88l25_m98357a" );
sound/soc/intel/skylake/skl.c +1 -1
@@ -803,7 +803,7 @@ static struct sst_acpi_mach sst_skl_devdata[] = { { "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL }, { "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin", NULL, NULL, &skl_dmic_data }, - { "MX98357A", "skl_nau88l25_max98357a_i2s", "intel/dsp_fw_release.bin", + { "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin", NULL, NULL, &skl_dmic_data }, {} };
Signature · 1 line
2.8.1
PATCH 3/5 ASoC: Intel: Kbl: add kabylake additional machine entries
In reply to Vinod KoulLike SKL, we have two more machines for KBL, so add these IDs
--- sound/soc/intel/skylake/skl.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/skylake/skl.c +2 -0
@@ -815,6 +815,8 @@ static struct sst_acpi_mach sst_bxtp_devdata[] = {static struct sst_acpi_mach sst_kbl_devdata[] = { {"INT343A" ,"kbl_alc286s_i2s" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL ,NULL }, + {"INT343B" ,"kbl_n88l25_s4567" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL , &skl_dmic_data }, + {"MX98357A" ,"kbl_n88l25_m98357a" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL , &skl_dmic_data }, {} };
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: Kbl: add kabylake additional machine entries" to the asoc tree
The patch
ASoC: Intel: Kbl: add kabylake additional machine entries
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
156a071b9c7d0bd6917bbddd736e47de94265f03Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Wed, 13 Jul 2016 22:13:45 +0530
Subject: [PATCH] ASoC: Intel: Kbl: add kabylake additional machine entries
Like SKL, we have two more machines for KBL, so add these IDs
--- sound/soc/intel/skylake/skl.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/skylake/skl.c +2 -0
@@ -815,6 +815,8 @@ static struct sst_acpi_mach sst_bxtp_devdata[] = {static struct sst_acpi_mach sst_kbl_devdata[] = { {"INT343A" ,"kbl_alc286s_i2s" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL ,NULL }, + {"INT343B" ,"kbl_n88l25_s4567" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL , &skl_dmic_data }, + {"MX98357A" ,"kbl_n88l25_m98357a" ,"intel/dsp_fw_kbl.bin" ,NULL ,NULL , &skl_dmic_data }, {} };
Signature · 1 line
2.8.1
PATCH 4/5 ASoC: Intel: board: add kabylake nau88l25_max98357a machine id
In reply to Vinod KoulLike SKL we have skl_nau88l25_max98357a machine for KBL, so add the ID for this machine too.
--- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/skl_nau88l25_max98357a.c +8 -0
@@ -656,12 +656,19 @@ static int skylake_audio_probe(struct platform_device *pdev)return devm_snd_soc_register_card (&pdev->dev, &skylake_audio_card); } +static const struct platform_device_id skl_board_ids[] = { + { .name ="skl_n88l25_m98357a" }, + { .name ="kbl_n88l25_m98357a" }, + { } +}; +static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { .name ="skl_n88l25_m98357a" , .pm = &snd_soc_pm_ops, }, + .id_table = skl_board_ids, };module_platform_driver (skylake_audio)
@@ -671,3 +678,4 @@ MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode");MODULE_AUTHOR ("Rohit Ainapure <[email protected]" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:skl_n88l25_m98357a" ); +MODULE_ALIAS ("platform:kbl_n88l25_m98357a" );
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: board: add kabylake nau88l25_max98357a machine id" to the asoc tree
The patch
ASoC: Intel: board: add kabylake nau88l25_max98357a machine id
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2ca972da5ac8ac03dce005f4b71d9198a408b068Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Wed, 13 Jul 2016 22:13:46 +0530
Subject: [PATCH] ASoC: Intel: board: add kabylake nau88l25_max98357a machine
id
Like SKL we have skl_nau88l25_max98357a machine for KBL, so add the ID for this machine too.
--- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/skl_nau88l25_max98357a.c +8 -0
@@ -656,12 +656,19 @@ static int skylake_audio_probe(struct platform_device *pdev)return devm_snd_soc_register_card (&pdev->dev, &skylake_audio_card); } +static const struct platform_device_id skl_board_ids[] = { + { .name ="skl_n88l25_m98357a" }, + { .name ="kbl_n88l25_m98357a" }, + { } +}; +static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { .name ="skl_n88l25_m98357a" , .pm = &snd_soc_pm_ops, }, + .id_table = skl_board_ids, };module_platform_driver (skylake_audio)
@@ -671,3 +678,4 @@ MODULE_DESCRIPTION("Audio Machine driver-NAU88L25 & MAX98357A in I2S mode");MODULE_AUTHOR ("Rohit Ainapure <[email protected]" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:skl_n88l25_m98357a" ); +MODULE_ALIAS ("platform:kbl_n88l25_m98357a" );
Signature · 1 line
2.8.1
PATCH 5/5 ASoC: Intel: board: add kabylake nau88l25_ssm4567 machine id
In reply to Vinod KoulLike SKL we have skl_nau88l25_ssm4567 machine for KBL, so add the ID for this machine too.
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +8 -0
@@ -708,12 +708,19 @@ static int skylake_audio_probe(struct platform_device *pdev)return devm_snd_soc_register_card (&pdev->dev, &skylake_audio_card); } +static const struct platform_device_id skl_board_ids[] = { + { .name ="skl_n88l25_s4567" }, + { .name ="kbl_n88l25_s4567" }, + { } +}; +static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { .name ="skl_n88l25_s4567" , .pm = &snd_soc_pm_ops, }, + .id_table = skl_board_ids, };module_platform_driver (skylake_audio)
@@ -727,3 +734,4 @@ MODULE_AUTHOR("Yong Zhi <[email protected]>");MODULE_DESCRIPTION ("Intel Audio Machine driver for SKL with NAU88L25 and SSM4567 in I2S Mode" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:skl_n88l25_s4567" ); +MODULE_ALIAS ("platform:kbl_n88l25_s4567" );
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "ASoC: Intel: board: add kabylake nau88l25_ssm4567 machine id" to the asoc tree
The patch
ASoC: Intel: board: add kabylake nau88l25_ssm4567 machine id
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
9dc201cf75e04fd2d753a1d01ed9d03f4253e32fMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Wed, 13 Jul 2016 22:13:47 +0530
Subject: [PATCH] ASoC: Intel: board: add kabylake nau88l25_ssm4567 machine id
Like SKL we have skl_nau88l25_ssm4567 machine for KBL, so add the ID for this machine too.
--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +8 -0
@@ -708,12 +708,19 @@ static int skylake_audio_probe(struct platform_device *pdev)return devm_snd_soc_register_card (&pdev->dev, &skylake_audio_card); } +static const struct platform_device_id skl_board_ids[] = { + { .name ="skl_n88l25_s4567" }, + { .name ="kbl_n88l25_s4567" }, + { } +}; +static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, .driver = { .name ="skl_n88l25_s4567" , .pm = &snd_soc_pm_ops, }, + .id_table = skl_board_ids, };module_platform_driver (skylake_audio)
@@ -727,3 +734,4 @@ MODULE_AUTHOR("Yong Zhi <[email protected]>");MODULE_DESCRIPTION ("Intel Audio Machine driver for SKL with NAU88L25 and SSM4567 in I2S Mode" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:skl_n88l25_s4567" ); +MODULE_ALIAS ("platform:kbl_n88l25_s4567" );
Signature · 1 line
2.8.1