alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [alsa-devel] [PATCH RESEND] ASoC: rt1011: set tx/rx slots from tx/rx_mask in TDM case
@ 2019-10-08  9:32 Shuming [范書銘]
  2019-10-09 14:15 ` Mark Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Shuming [范書銘] @ 2019-10-08  9:32 UTC (permalink / raw)
  To: broonie, lgirdwood
  Cc: Oder Chiou, Jack Yu, alsa-devel, lars,
	Derek [方德義],
	sathya.prakash.m.r, Flove(HsinFu)

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

The TX/RX slot configuration use tx/rx_mask which requested
by the machine driver.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
---
 sound/soc/codecs/rt1011.c | 97 +++++++++++++++++++++++++++++++++++++--
 sound/soc/codecs/rt1011.h | 23 ++++++++++
 2 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c
index be1e276e3631..a36144de11cf 100644
--- a/sound/soc/codecs/rt1011.c
+++ b/sound/soc/codecs/rt1011.c
@@ -1805,8 +1805,8 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
 	struct snd_soc_component *component = dai->component;
 	struct snd_soc_dapm_context *dapm =
 		snd_soc_component_get_dapm(component);
-	unsigned int val = 0, tdm_en = 0;
-	int ret = 0;
+	unsigned int val = 0, tdm_en = 0, rx_slotnum, tx_slotnum;
+	int ret = 0, first_bit, last_bit;
 
 	snd_soc_dapm_mutex_lock(dapm);
 	if (rx_mask || tx_mask)
@@ -1850,6 +1850,91 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
 		ret = -EINVAL;
 	}
 
+	/* Rx slot configuration */
+	rx_slotnum = hweight_long(rx_mask);
+	first_bit = find_next_bit((unsigned long *)&rx_mask, 32, 0);
+	if (rx_slotnum > 1 || rx_slotnum == 0) {
+		ret = -EINVAL;
+		dev_dbg(component->dev, "too many rx slots or zero slot\n");
+		goto _set_tdm_err_;
+	}
+	if (rx_slotnum) {
+		if (first_bit == 0 || first_bit == 2 ||
+			first_bit == 4 || first_bit == 6) {
+			snd_soc_component_update_bits(component,
+				RT1011_CROSS_BQ_SET_1,	RT1011_MONO_LR_SEL_MASK,
+				RT1011_MONO_L_CHANNEL);
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_4,
+				RT1011_TDM_I2S_TX_L_DAC1_1_MASK |
+				RT1011_TDM_I2S_TX_R_DAC1_1_MASK,
+				(first_bit << RT1011_TDM_I2S_TX_L_DAC1_1_SFT) |
+				((first_bit+1)
+				<< RT1011_TDM_I2S_TX_R_DAC1_1_SFT));
+		} else {
+			snd_soc_component_update_bits(component,
+				RT1011_CROSS_BQ_SET_1,	RT1011_MONO_LR_SEL_MASK,
+				RT1011_MONO_R_CHANNEL);
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_4,
+				RT1011_TDM_I2S_TX_L_DAC1_1_MASK |
+				RT1011_TDM_I2S_TX_R_DAC1_1_MASK,
+				((first_bit-1)
+				<< RT1011_TDM_I2S_TX_L_DAC1_1_SFT) |
+				(first_bit << RT1011_TDM_I2S_TX_R_DAC1_1_SFT));
+		}
+	}
+
+	/* Tx slot configuration */
+	tx_slotnum = hweight_long(tx_mask);
+	first_bit = find_next_bit((unsigned long *)&tx_mask, 32, 0);
+	last_bit = find_last_bit((unsigned long *)&tx_mask, 32);
+	if (tx_slotnum > 2 ||	(last_bit-first_bit) > 1) {
+		ret = -EINVAL;
+		dev_dbg(component->dev, "too many tx slots or tx slot location error\n");
+		goto _set_tdm_err_;
+	}
+
+	if (tx_slotnum == 1) {
+		snd_soc_component_update_bits(component, RT1011_TDM1_SET_2,
+			RT1011_TDM_I2S_DOCK_ADCDAT_LEN_1_MASK |
+			RT1011_TDM_ADCDAT1_DATA_LOCATION,	first_bit);
+		if (first_bit == 1)
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_3,
+				RT1011_TDM_I2S_RX_ADC1_1_MASK,
+				RT1011_TDM_I2S_RX_ADC1_1_LL);
+		else if (first_bit == 3)
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_3,
+				RT1011_TDM_I2S_RX_ADC2_1_MASK,
+				RT1011_TDM_I2S_RX_ADC2_1_LL);
+		else if (first_bit == 5)
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_3,
+				RT1011_TDM_I2S_RX_ADC3_1_MASK,
+				RT1011_TDM_I2S_RX_ADC3_1_LL);
+		else if (first_bit == 7)
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_3,
+				RT1011_TDM_I2S_RX_ADC4_1_MASK,
+				RT1011_TDM_I2S_RX_ADC4_1_LL);
+	} else if (tx_slotnum == 2) {
+		if (first_bit == 0 || first_bit == 2 ||
+			first_bit == 4 || first_bit == 6) {
+			snd_soc_component_update_bits(component,
+				RT1011_TDM1_SET_2,
+				RT1011_TDM_I2S_DOCK_ADCDAT_LEN_1_MASK |
+				RT1011_TDM_ADCDAT1_DATA_LOCATION,
+				RT1011_TDM_I2S_DOCK_ADCDAT_2CH | first_bit);
+		} else {
+			ret = -EINVAL;
+			dev_dbg(component->dev,
+				"tx slot location should be paired and start from slot0/2/4/6\n");
+			goto _set_tdm_err_;
+		}
+	}
+
 	snd_soc_component_update_bits(component, RT1011_TDM1_SET_1,
 		RT1011_I2S_CH_TX_MASK | RT1011_I2S_CH_RX_MASK |
 		RT1011_I2S_CH_TX_LEN_MASK |	RT1011_I2S_CH_RX_LEN_MASK, val);
@@ -1860,10 +1945,12 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
 		RT1011_TDM_I2S_DOCK_EN_1_MASK,	tdm_en);
 	snd_soc_component_update_bits(component, RT1011_TDM2_SET_2,
 		RT1011_TDM_I2S_DOCK_EN_2_MASK,	tdm_en);
-	snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET,
-		RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,
-		RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);
+	if (tx_slotnum)
+		snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET,
+			RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,
+			RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);
 
+_set_tdm_err_:
 	snd_soc_dapm_mutex_unlock(dapm);
 	return ret;
 }
diff --git a/sound/soc/codecs/rt1011.h b/sound/soc/codecs/rt1011.h
index 2d65983f3d0f..3f7dea1191ad 100644
--- a/sound/soc/codecs/rt1011.h
+++ b/sound/soc/codecs/rt1011.h
@@ -460,6 +460,23 @@
 #define RT1011_TDM_I2S_DOCK_EN_1_MASK			(0x1 << 3)
 #define RT1011_TDM_I2S_DOCK_EN_1_SFT			3
 #define RT1011_TDM_I2S_DOCK_EN_1		(0x1 << 3)
+#define RT1011_TDM_ADCDAT1_DATA_LOCATION			(0x7 << 0)
+
+/* TDM1 Setting-3 (0x0118) */
+#define RT1011_TDM_I2S_RX_ADC1_1_MASK			(0x3 << 6)
+#define RT1011_TDM_I2S_RX_ADC2_1_MASK			(0x3 << 4)
+#define RT1011_TDM_I2S_RX_ADC3_1_MASK			(0x3 << 2)
+#define RT1011_TDM_I2S_RX_ADC4_1_MASK			(0x3 << 0)
+#define RT1011_TDM_I2S_RX_ADC1_1_LL			(0x2 << 6)
+#define RT1011_TDM_I2S_RX_ADC2_1_LL			(0x2 << 4)
+#define RT1011_TDM_I2S_RX_ADC3_1_LL			(0x2 << 2)
+#define RT1011_TDM_I2S_RX_ADC4_1_LL			(0x2 << 0)
+
+/* TDM1 Setting-4 (0x011a) */
+#define RT1011_TDM_I2S_TX_L_DAC1_1_MASK			(0x7 << 12)
+#define RT1011_TDM_I2S_TX_R_DAC1_1_MASK			(0x7 << 8)
+#define RT1011_TDM_I2S_TX_L_DAC1_1_SFT 12
+#define RT1011_TDM_I2S_TX_R_DAC1_1_SFT 8
 
 /* TDM2 Setting-2 (0x0120) */
 #define RT1011_TDM_I2S_DOCK_ADCDAT_LEN_2_MASK			(0x7 << 13)
@@ -585,6 +602,12 @@
 #define RT1011_STP_T0_EN_BIT		6
 #define RT1011_STP_T0_EN		(0x1 << 6)
 
+/* Cross Biquad Setting-1 (0x0702) */
+#define RT1011_MONO_LR_SEL_MASK			(0x3 << 5)
+#define RT1011_MONO_L_CHANNEL			(0x0 << 5)
+#define RT1011_MONO_R_CHANNEL			(0x1 << 5)
+#define RT1011_MONO_LR_MIX_CHANNEL			(0x2 << 5)
+
 /* ClassD Internal Setting-1 (0x1300) */
 #define RT1011_DRIVER_READY_SPK			(0x1 << 12)
 #define RT1011_DRIVER_READY_SPK_BIT		12
-- 
2.23.0


[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 6937 bytes --]

[-- Attachment #3: Type: text/plain, Size: 161 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH RESEND] ASoC: rt1011: set tx/rx slots from tx/rx_mask in TDM case
  2019-10-08  9:32 [alsa-devel] [PATCH RESEND] ASoC: rt1011: set tx/rx slots from tx/rx_mask in TDM case Shuming [范書銘]
@ 2019-10-09 14:15 ` Mark Brown
  2019-10-14  1:46   ` Shuming [范書銘]
  0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2019-10-09 14:15 UTC (permalink / raw)
  To: Shuming [范書銘]
  Cc: Oder Chiou, Jack Yu, alsa-devel, lars, lgirdwood,
	Derek [方德義],
	sathya.prakash.m.r, Flove(HsinFu)


[-- Attachment #1.1: Type: text/plain, Size: 302 bytes --]

On Tue, Oct 08, 2019 at 09:32:05AM +0000, Shuming [范書銘] wrote:

> +		if (first_bit == 0 || first_bit == 2 ||
> +			first_bit == 4 || first_bit == 6) {


> +		} else {
> +		}

This would be more idiomatically written as a switch statement, as would
the equivalent stuff on the TX side.

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

[-- Attachment #2: Type: text/plain, Size: 161 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH RESEND] ASoC: rt1011: set tx/rx slots from tx/rx_mask in TDM case
  2019-10-09 14:15 ` Mark Brown
@ 2019-10-14  1:46   ` Shuming [范書銘]
  0 siblings, 0 replies; 3+ messages in thread
From: Shuming [范書銘] @ 2019-10-14  1:46 UTC (permalink / raw)
  To: Mark Brown
  Cc: Oder Chiou, Jack Yu, alsa-devel, lars, lgirdwood,
	Derek [方德義],
	sathya.prakash.m.r, Flove(HsinFu)

> On Tue, Oct 08, 2019 at 09:32:05AM +0000, Shuming [范書銘] wrote:
> 
> > +		if (first_bit == 0 || first_bit == 2 ||
> > +			first_bit == 4 || first_bit == 6) {
> 
> 
> > +		} else {
> > +		}
> 
> This would be more idiomatically written as a switch statement, as would the
> equivalent stuff on the TX side.

OK, I will modify it as a switch statement and send v2 patch.

> ------Please consider the environment before printing this e-mail.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-14  1:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-08  9:32 [alsa-devel] [PATCH RESEND] ASoC: rt1011: set tx/rx slots from tx/rx_mask in TDM case Shuming [范書銘]
2019-10-09 14:15 ` Mark Brown
2019-10-14  1:46   ` Shuming [范書銘]

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).