Unverified Commit d8572da0 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: meson: Migrate to new style legacy DAI naming flag 



Change the legacy DAI naming flag from opting in to the new scheme
(non_legacy_dai_naming), to opting out of it (legacy_dai_naming).
These drivers appear to be on the CPU side of the DAI link and
currently uses the legacy naming, so add the new flag.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-17-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 725cf3bc

sound/soc/meson/axg-frddr.c

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static const struct snd_soc_component_driver axg_frddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data axg_frddr_match_data = {
@@ -286,6 +287,7 @@ static const struct snd_soc_component_driver g12a_frddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data g12a_frddr_match_data = {
@@ -356,6 +358,7 @@ static const struct snd_soc_component_driver sm1_frddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data sm1_frddr_match_data = {

sound/soc/meson/axg-pdm.c

+3 −1
Original line number Diff line number Diff line
@@ -457,7 +457,9 @@ static struct snd_soc_dai_driver axg_pdm_dai_drv = { 
	.remove		= axg_pdm_dai_remove,

};



static const struct snd_soc_component_driver axg_pdm_component_drv = {};

static const struct snd_soc_component_driver axg_pdm_component_drv = {

	.legacy_dai_naming = 1,

};



static const struct regmap_config axg_pdm_regmap_cfg = {

	.reg_bits	= 32,

sound/soc/meson/axg-spdifin.c

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ static const struct snd_kcontrol_new axg_spdifin_controls[] = { 
static const struct snd_soc_component_driver axg_spdifin_component_drv = {

	.controls		= axg_spdifin_controls,

	.num_controls		= ARRAY_SIZE(axg_spdifin_controls),

	.legacy_dai_naming	= 1,

};



static const struct regmap_config axg_spdifin_regmap_cfg = {

sound/soc/meson/axg-spdifout.c

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static const struct snd_soc_component_driver axg_spdifout_component_drv = { 
	.dapm_routes		= axg_spdifout_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(axg_spdifout_dapm_routes),

	.set_bias_level		= axg_spdifout_set_bias_level,

	.legacy_dai_naming	= 1,

};



static const struct regmap_config axg_spdifout_regmap_cfg = {

sound/soc/meson/axg-toddr.c

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static const struct snd_soc_component_driver axg_toddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data axg_toddr_match_data = {
@@ -242,6 +243,7 @@ static const struct snd_soc_component_driver g12a_toddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data g12a_toddr_match_data = {
@@ -312,6 +314,7 @@ static const struct snd_soc_component_driver sm1_toddr_component_drv = { 
	.hw_free		= axg_fifo_pcm_hw_free,

	.pointer		= axg_fifo_pcm_pointer,

	.trigger		= axg_fifo_pcm_trigger,

	.legacy_dai_naming	= 1,

};



static const struct axg_fifo_match_data sm1_toddr_match_data = {