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

ASoC: rockchip: 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-27-ckeepax@opensource.cirrus.com


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

sound/soc/rockchip/rockchip_i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { 


static const struct snd_soc_component_driver rockchip_i2s_component = {

	.name = DRV_NAME,

	.legacy_dai_naming = 1,

};



static bool rockchip_i2s_wr_reg(struct device *dev, unsigned int reg)

sound/soc/rockchip/rockchip_i2s_tdm.c

+1 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = { 


static const struct snd_soc_component_driver rockchip_i2s_tdm_component = {

	.name = DRV_NAME,

	.legacy_dai_naming = 1,

};



static bool rockchip_i2s_tdm_wr_reg(struct device *dev, unsigned int reg)

sound/soc/rockchip/rockchip_pdm.c

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static struct snd_soc_dai_driver rockchip_pdm_dai = { 


static const struct snd_soc_component_driver rockchip_pdm_component = {

	.name = "rockchip-pdm",

	.legacy_dai_naming = 1,

};



static int rockchip_pdm_runtime_suspend(struct device *dev)

sound/soc/rockchip/rockchip_spdif.c

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ static struct snd_soc_dai_driver rk_spdif_dai = { 


static const struct snd_soc_component_driver rk_spdif_component = {

	.name = "rockchip-spdif",

	.legacy_dai_naming = 1,

};



static bool rk_spdif_wr_reg(struct device *dev, unsigned int reg)