All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
@ 2021-09-27 14:32 ` Brent Lu
  0 siblings, 0 replies; 6+ messages in thread
From: Brent Lu @ 2021-09-27 14:32 UTC (permalink / raw)
  To: alsa-devel
  Cc: Cezary Rojewski, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
	Mark Brown, Jaroslav Kysela, Takashi Iwai, Brent Lu,
	Kai Vehmanen, Guennadi Liakhovetski, Yong Zhi,
	Vamshi Krishna Gopal, Tzung-Bi Shih, Rander Wang, Bard Liao,
	Libin Yang, Paul Olaru, Gongjun Song, Christophe JAILLET,
	Peter Ujfalusi, linux-kernel

To follow 20-character length limitation of platform device name, we
have only 7 character space for amplifier. Therefore, the last
character of mx98357a and mx98360a is removed to save space.

Signed-off-by: Brent Lu <brent.lu@intel.com>
---
 sound/soc/intel/boards/sof_rt5682.c               | 8 ++++----
 sound/soc/intel/common/soc-acpi-intel-adl-match.c | 2 +-
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 3f6f19d9b19e..ad42d4c7ade5 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -959,7 +959,7 @@ static const struct platform_device_id board_ids[] = {
 		.name = "sof_rt5682",
 	},
 	{
-		.name = "tgl_mx98357a_rt5682",
+		.name = "tgl_mx98357_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -989,7 +989,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 	},
 	{
-		.name = "jsl_rt5682_mx98360a",
+		.name = "jsl_rt5682_mx98360",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
@@ -1039,7 +1039,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 	},
 	{
-		.name = "adl_mx98357a_rt5682",
+		.name = "adl_mx98357_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -1067,7 +1067,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_SSP_AMP(1)),
 	},
 	{
-		.name = "jsl_rt5682s_mx98360a",
+		.name = "jsl_rt5682s_mx98360",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index a0f6a69c7038..e4ff280eac23 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -291,7 +291,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "adl_mx98357a_rt5682",
+		.drv_name = "adl_mx98357_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_max98357a_amp,
 		.sof_fw_filename = "sof-adl.ri",
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index cfd6bf756215..20fd9dcc74af 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -67,7 +67,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "jsl_rt5682_mx98360a",
+		.drv_name = "jsl_rt5682_mx98360",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
@@ -99,7 +99,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "RTL5682",
-		.drv_name = "jsl_rt5682s_mx98360a",
+		.drv_name = "jsl_rt5682s_mx98360",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 785d5f5f8a9c..91ef71c2535d 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -333,7 +333,7 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_mx98357a_rt5682",
+		.drv_name = "tgl_mx98357_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_codecs,
 		.sof_fw_filename = "sof-tgl.ri",
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
@ 2021-09-27 14:32 ` Brent Lu
  0 siblings, 0 replies; 6+ messages in thread
From: Brent Lu @ 2021-09-27 14:32 UTC (permalink / raw)
  To: alsa-devel
  Cc: Libin Yang, Guennadi Liakhovetski, Cezary Rojewski, linux-kernel,
	Kai Vehmanen, Peter Ujfalusi, Takashi Iwai, Jie Yang,
	Pierre-Louis Bossart, Liam Girdwood, Tzung-Bi Shih, Mark Brown,
	Christophe JAILLET, Bard Liao, Paul Olaru, Rander Wang,
	Gongjun Song, Brent Lu, Vamshi Krishna Gopal, Yong Zhi

To follow 20-character length limitation of platform device name, we
have only 7 character space for amplifier. Therefore, the last
character of mx98357a and mx98360a is removed to save space.

Signed-off-by: Brent Lu <brent.lu@intel.com>
---
 sound/soc/intel/boards/sof_rt5682.c               | 8 ++++----
 sound/soc/intel/common/soc-acpi-intel-adl-match.c | 2 +-
 sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 3f6f19d9b19e..ad42d4c7ade5 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -959,7 +959,7 @@ static const struct platform_device_id board_ids[] = {
 		.name = "sof_rt5682",
 	},
 	{
-		.name = "tgl_mx98357a_rt5682",
+		.name = "tgl_mx98357_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -989,7 +989,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 	},
 	{
-		.name = "jsl_rt5682_mx98360a",
+		.name = "jsl_rt5682_mx98360",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
@@ -1039,7 +1039,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 	},
 	{
-		.name = "adl_mx98357a_rt5682",
+		.name = "adl_mx98357_rt5682",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0) |
 					SOF_SPEAKER_AMP_PRESENT |
@@ -1067,7 +1067,7 @@ static const struct platform_device_id board_ids[] = {
 					SOF_RT5682_SSP_AMP(1)),
 	},
 	{
-		.name = "jsl_rt5682s_mx98360a",
+		.name = "jsl_rt5682s_mx98360",
 		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_MCLK_24MHZ |
 					SOF_RT5682_SSP_CODEC(0) |
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index a0f6a69c7038..e4ff280eac23 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -291,7 +291,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "adl_mx98357a_rt5682",
+		.drv_name = "adl_mx98357_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &adl_max98357a_amp,
 		.sof_fw_filename = "sof-adl.ri",
diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index cfd6bf756215..20fd9dcc74af 100644
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -67,7 +67,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "10EC5682",
-		.drv_name = "jsl_rt5682_mx98360a",
+		.drv_name = "jsl_rt5682_mx98360",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
@@ -99,7 +99,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
 	},
 	{
 		.id = "RTL5682",
-		.drv_name = "jsl_rt5682s_mx98360a",
+		.drv_name = "jsl_rt5682s_mx98360",
 		.sof_fw_filename = "sof-jsl.ri",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &mx98360a_spk,
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 785d5f5f8a9c..91ef71c2535d 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -333,7 +333,7 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
 	{
 		.id = "10EC5682",
-		.drv_name = "tgl_mx98357a_rt5682",
+		.drv_name = "tgl_mx98357_rt5682",
 		.machine_quirk = snd_soc_acpi_codec_list,
 		.quirk_data = &tgl_codecs,
 		.sof_fw_filename = "sof-tgl.ri",
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
  2021-09-27 14:32 ` Brent Lu
@ 2021-09-27 14:47   ` Pierre-Louis Bossart
  -1 siblings, 0 replies; 6+ messages in thread
From: Pierre-Louis Bossart @ 2021-09-27 14:47 UTC (permalink / raw)
  To: Brent Lu, alsa-devel
  Cc: Libin Yang, Guennadi Liakhovetski, Cezary Rojewski, linux-kernel,
	Kai Vehmanen, Peter Ujfalusi, Takashi Iwai, Jie Yang,
	Liam Girdwood, Tzung-Bi Shih, Mark Brown, Christophe JAILLET,
	Bard Liao, Paul Olaru, Rander Wang, Gongjun Song,
	Vamshi Krishna Gopal, Yong Zhi



On 9/27/21 9:32 AM, Brent Lu wrote:
> To follow 20-character length limitation of platform device name, we
> have only 7 character space for amplifier. Therefore, the last
> character of mx98357a and mx98360a is removed to save space.
> 
> Signed-off-by: Brent Lu <brent.lu@intel.com>

This patch fixes an issue reported in our Sparse checks:

sound/soc/intel/boards/sof_rt5682.c:1070:25: error: too long
initializer-string for array of char(no space for nul char)

Fixes: e224ef76fa8a ('ASoC: intel: sof_rt5682: support
jsl_rt5682s_mx98360a board')

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

FWIW here's what we use in our checks:

export ARCH=x86_64 CF="-Wsparse-error -Wsparse-all -Wno-bitwise-pointer
-Wno-pointer-arith -Wno-typesign -Wnoshadow"
make allmodconfig
make -k sound/soc/sof/ C=2
make -k sound/soc/intel/common/ C=2
make -k sound/soc/intel/boards/ C=2
make -k sound/soc/amd/ C=2
make -k drivers/soundwire/ C=2


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
@ 2021-09-27 14:47   ` Pierre-Louis Bossart
  0 siblings, 0 replies; 6+ messages in thread
From: Pierre-Louis Bossart @ 2021-09-27 14:47 UTC (permalink / raw)
  To: Brent Lu, alsa-devel
  Cc: Libin Yang, Guennadi Liakhovetski, Cezary Rojewski, Kai Vehmanen,
	Gongjun Song, Jie Yang, linux-kernel, Takashi Iwai,
	Liam Girdwood, Tzung-Bi Shih, Mark Brown, Christophe JAILLET,
	Vamshi Krishna Gopal, Paul Olaru, Rander Wang, Peter Ujfalusi,
	Bard Liao, Yong Zhi



On 9/27/21 9:32 AM, Brent Lu wrote:
> To follow 20-character length limitation of platform device name, we
> have only 7 character space for amplifier. Therefore, the last
> character of mx98357a and mx98360a is removed to save space.
> 
> Signed-off-by: Brent Lu <brent.lu@intel.com>

This patch fixes an issue reported in our Sparse checks:

sound/soc/intel/boards/sof_rt5682.c:1070:25: error: too long
initializer-string for array of char(no space for nul char)

Fixes: e224ef76fa8a ('ASoC: intel: sof_rt5682: support
jsl_rt5682s_mx98360a board')

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

FWIW here's what we use in our checks:

export ARCH=x86_64 CF="-Wsparse-error -Wsparse-all -Wno-bitwise-pointer
-Wno-pointer-arith -Wno-typesign -Wnoshadow"
make allmodconfig
make -k sound/soc/sof/ C=2
make -k sound/soc/intel/common/ C=2
make -k sound/soc/intel/boards/ C=2
make -k sound/soc/amd/ C=2
make -k drivers/soundwire/ C=2


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
  2021-09-27 14:32 ` Brent Lu
@ 2021-09-28 16:23   ` Mark Brown
  -1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2021-09-28 16:23 UTC (permalink / raw)
  To: Brent Lu, alsa-devel
  Cc: Mark Brown, Peter Ujfalusi, Libin Yang, Bard Liao, Jie Yang,
	Paul Olaru, Rander Wang, Christophe JAILLET, Yong Zhi,
	Takashi Iwai, Gongjun Song, Kai Vehmanen, Pierre-Louis Bossart,
	Liam Girdwood, Vamshi Krishna Gopal, Jaroslav Kysela,
	Tzung-Bi Shih, Guennadi Liakhovetski, linux-kernel,
	Cezary Rojewski

On Mon, 27 Sep 2021 22:32:49 +0800, Brent Lu wrote:
> To follow 20-character length limitation of platform device name, we
> have only 7 character space for amplifier. Therefore, the last
> character of mx98357a and mx98360a is removed to save space.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
      commit: 3c561a090c7920624b83005a279a66cc8a7bed2b

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
@ 2021-09-28 16:23   ` Mark Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2021-09-28 16:23 UTC (permalink / raw)
  To: Brent Lu, alsa-devel
  Cc: Libin Yang, Pierre-Louis Bossart, Cezary Rojewski, linux-kernel,
	Kai Vehmanen, Guennadi Liakhovetski, Gongjun Song, Jie Yang,
	Takashi Iwai, Rander Wang, Liam Girdwood, Tzung-Bi Shih,
	Mark Brown, Christophe JAILLET, Vamshi Krishna Gopal, Paul Olaru,
	Peter Ujfalusi, Bard Liao, Yong Zhi

On Mon, 27 Sep 2021 22:32:49 +0800, Brent Lu wrote:
> To follow 20-character length limitation of platform device name, we
> have only 7 character space for amplifier. Therefore, the last
> character of mx98357a and mx98360a is removed to save space.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier
      commit: 3c561a090c7920624b83005a279a66cc8a7bed2b

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-28 16:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-27 14:32 [PATCH] ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier Brent Lu
2021-09-27 14:32 ` Brent Lu
2021-09-27 14:47 ` Pierre-Louis Bossart
2021-09-27 14:47   ` Pierre-Louis Bossart
2021-09-28 16:23 ` Mark Brown
2021-09-28 16:23   ` Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.