[RFC] ASoC: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[RFC] ASoC: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

Hi Mark

ASoC has both

	(A) SND_SOC_DAIFMT_CB{MS}_CF{MS}
	(B) SND_SOC_DAIFMT_CB{PC}_CF{PC}
	                      ^^     ^^
M/S is Master/Slave, P/C is Provider/Consumer.
       ^      ^             ^        ^

We should not use (A) today, use (B) instead, but we still have (A)
definition for backword compatibility.
I think we should full switch to use (B), and remove (A).

But it will be too big-patch-set. To avoid patch-bomb, I will post
some of them as sample. I will post full-patch-set if there was no
objection.

Thank you for your help !!

Best regards
---
Kuninori Morimoto

[RFC] ASoC: Documentation: DPCM: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 Documentation/sound/soc/dpcm.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst
index 02419a6f82132..a12636552f502 100644
--- a/Documentation/sound/soc/dpcm.rst
+++ b/Documentation/sound/soc/dpcm.rst
@@ -362,7 +362,7 @@ The machine driver sets some additional parameters to the DAI link i.e.
 		.codec_dai_name = "modem-aif1",
 		.codec_name = "modem",
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-				| SND_SOC_DAIFMT_CBM_CFM,
+				| SND_SOC_DAIFMT_CBP_CFP,
 		.c2c_params = &dai_params,
 		.num_c2c_params = 1,
 	}
-- 
2.43.0

[RFC] ASoC: sh: migor: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/renesas/migor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/renesas/migor.c b/sound/soc/renesas/migor.c
index 5a0bc6edac0a0..45fc594d331b0 100644
--- a/sound/soc/renesas/migor.c
+++ b/sound/soc/renesas/migor.c
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link migor_dai = {
 	.name = "wm8978",
 	.stream_name = "WM8978",
 	.dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S |
-		   SND_SOC_DAIFMT_CBS_CFS,
+		   SND_SOC_DAIFMT_CBC_CFC,
 	.ops = &migor_dai_ops,
 	SND_SOC_DAILINK_REG(wm8978),
 };
-- 
2.43.0

[RFC] ASoC: ti: rx51: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/ti/rx51.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c
index d9900c69e536f..e969031657e9a 100644
--- a/sound/soc/ti/rx51.c
+++ b/sound/soc/ti/rx51.c
@@ -307,7 +307,7 @@ static struct snd_soc_dai_link rx51_dai[] = {
 		.name = "TLV320AIC34",
 		.stream_name = "AIC34",
 		.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
-			   SND_SOC_DAIFMT_CBM_CFM,
+			   SND_SOC_DAIFMT_CBP_CFP,
 		.init = rx51_aic34_init,
 		.ops = &rx51_ops,
 		SND_SOC_DAILINK_REG(aic34),
-- 
2.43.0

[RFC] ASoC: kirkwood: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/kirkwood/armada-370-db.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c
index 79ee7599f06a9..77a5f440364e4 100644
--- a/sound/soc/kirkwood/armada-370-db.c
+++ b/sound/soc/kirkwood/armada-370-db.c
@@ -73,20 +73,20 @@ static struct snd_soc_dai_link a370db_dai[] = {
 {
 	.name = "CS42L51",
 	.stream_name = "analog",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
+	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC,
 	.ops = &a370db_ops,
 	SND_SOC_DAILINK_REG(analog),
 },
 {
 	.name = "S/PDIF out",
 	.stream_name = "spdif-out",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
+	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC,
 	SND_SOC_DAILINK_REG(spdif_out),
 },
 {
 	.name = "S/PDIF in",
 	.stream_name = "spdif-in",
-	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
+	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBC_CFC,
 	SND_SOC_DAILINK_REG(spdif_in),
 },
 };
-- 
2.43.0

[RFC] ASoC: soc-dai: remove SND_SOC_DAIFMT_CB{MS}_CF{MS}

[Kuninori Morimoto]

No drivers are using SND_SOC_DAIFMT_CB{MS}_CF{MS}.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 include/sound/soc-dai.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index a11501752637c..c3a3ba4b0bb7e 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -118,12 +118,6 @@ struct snd_compr_stream;
 #define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */
 #define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */
 
-/* previous definitions kept for backwards-compatibility, do not use in new contributions */
-#define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP
-#define SND_SOC_DAIFMT_CBS_CFM		SND_SOC_DAIFMT_CBC_CFP
-#define SND_SOC_DAIFMT_CBM_CFS		SND_SOC_DAIFMT_CBP_CFC
-#define SND_SOC_DAIFMT_CBS_CFS		SND_SOC_DAIFMT_CBC_CFC
-
 /* when passed to set_fmt directly indicate if the device is provider or consumer */
 #define SND_SOC_DAIFMT_BP_FP		SND_SOC_DAIFMT_CBP_CFP
 #define SND_SOC_DAIFMT_BC_FP		SND_SOC_DAIFMT_CBC_CFP
-- 
2.43.0

Re: [RFC] ASoC: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

On Wed, Feb 19, 2025 at 01:18:51AM +0000, Kuninori Morimoto wrote:

> We should not use (A) today, use (B) instead, but we still have (A)
> definition for backword compatibility.
> I think we should full switch to use (B), and remove (A).

> But it will be too big-patch-set. To avoid patch-bomb, I will post
> some of them as sample. I will post full-patch-set if there was no
> objection.

Yes, we should do the conversion - I've been chipping away at this
intermittently myself (mainly for CODECs).  If you want to push through
the remainder that'd be awesome!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [RFC] ASoC: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Kuninori Morimoto]

Hi Mark

> > We should not use (A) today, use (B) instead, but we still have (A)
> > definition for backword compatibility.
> > I think we should full switch to use (B), and remove (A).
> 
> > But it will be too big-patch-set. To avoid patch-bomb, I will post
> > some of them as sample. I will post full-patch-set if there was no
> > objection.
> 
> Yes, we should do the conversion - I've been chipping away at this
> intermittently myself (mainly for CODECs).  If you want to push through
> the remainder that'd be awesome!

Thank for the feedback.
I will wait 1 or 2 weeks to get other feedback, and will post the patch-set

Thank you for your help !!

Best regards
---
Kuninori Morimoto

Re: [RFC] ASoC: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

On Wed, Feb 19, 2025 at 02:18:07AM +0000, Kuninori Morimoto wrote:

> Thank for the feedback.
> I will wait 1 or 2 weeks to get other feedback, and will post the patch-set

Great, thanks.  I might just go ahead and apply the conversion patches
you've sent if there's no concerns after a bit of delay to make the
series a little more managable.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: (subset) [RFC] ASoC: Documentation: DPCM: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

On Wed, 19 Feb 2025 01:19:10 +0000, Kuninori Morimoto wrote:
> In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: Documentation: DPCM: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
      commit: 5a09e179024e76afdf9ad3a6ae767b4e06884ea8

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

Re: [RFC] ASoC: sh: migor: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

On Wed, 19 Feb 2025 01:19:21 +0000, Kuninori Morimoto wrote:
> In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: sh: migor: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
      commit: a5a3de8990f47f4c54ca5daeeea8ff7daa42f9de

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

Re: [RFC] ASoC: ti: rx51: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

On Wed, 19 Feb 2025 01:19:31 +0000, Kuninori Morimoto wrote:
> In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: ti: rx51: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
      commit: 38399716e353776dca7f04dbae98a07af68f2880

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

Re: [RFC] ASoC: kirkwood: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

[Mark Brown]

On Wed, 19 Feb 2025 01:19:48 +0000, Kuninori Morimoto wrote:
> In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: kirkwood: use inclusive language for SND_SOC_DAIFMT_CBx_CFx
      commit: 1c4749873bd0f769a47372636a428484e7035f59

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