ASoC: change set_tdm_slot api to allow slot_size override.
Subsystems (4)
PATCH v2 1/2 ASoC: change set_tdm_slot api to allow slot_size override.
Extend set_tdm_slot to allow the user to arbitrarily set the frame width and active TX/RX slots.
Updates magician.c and wm9081.c for the new set_tdm_slot(). wm9081.c still doesn't handle the slot_width override, I will submit this as a separate patch after I figure how to handle the I2S case.
(this series is meant for Mark's for-2.6.32 branch + "remove duplicated code" patch I sent yesterday)
--- include/sound/soc-dai.h | 5 +++-- sound/soc/codecs/wm9081.c | 5 +++-- sound/soc/pxa/magician.c | 2 +- sound/soc/pxa/pxa-ssp.c | 27 ++++++++++++++++++++------- sound/soc/soc-core.c | 9 ++++++--- 5 files changed, 33 insertions(+), 15 deletions(-)
include/sound/soc-dai.h +3 -2
@@ -106,7 +106,7 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai,int snd_soc_dai_set_fmt (struct snd_soc_dai *dai,unsigned int fmt);int snd_soc_dai_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots); +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width);int snd_soc_dai_set_tristate (struct snd_soc_dai *dai,int tristate);
@@ -140,7 +140,8 @@ struct snd_soc_dai_ops {*/ int (*set_fmt)(struct snd_soc_dai *dai,unsigned int fmt);int (*set_tdm_slot)(struct snd_soc_dai *dai, -unsigned int mask,int slots); +unsigned int tx_mask,unsigned int rx_mask, +int slots,int slot_width);int (*set_tristate)(struct snd_soc_dai *dai,int tristate);/*
sound/soc/codecs/wm9081.c +3 -2
@@ -1206,8 +1206,9 @@ static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai,return 0 ; } +/* FIXME: Needs to handle slot_width */ static int wm9081_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {struct snd_soc_codec *codec = dai->codec;unsigned int aif1 =wm9081_read (codec,WM9081_AUDIO_INTERFACE_1 );
@@ -1219,7 +1220,7 @@ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, aif1 |= (slots -1 ) <<WM9081_AIFDAC_TDM_MODE_SHIFT ; -switch (mask) { +switch (rx_mask) {case 1 :break ;case 2 :
sound/soc/pxa/magician.c +1 -1
@@ -188,7 +188,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_tdm_slot (cpu_dai,1 ,1 ); + ret =snd_soc_dai_set_tdm_slot (cpu_dai,1 ,0 ,1 , width);if (ret <0 )return ret;
sound/soc/pxa/pxa-ssp.c +20 -7
@@ -375,21 +375,34 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,* Set the active slots in TDM/Network mode */ static int pxa_ssp_set_dai_tdm_slot (struct snd_soc_dai *cpu_dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {struct ssp_priv *priv = cpu_dai->private_data;struct ssp_device *ssp = priv->dev.ssp;u32 sscr0; - sscr0 =ssp_read_reg (ssp,SSCR0 ) & ~SSCR0_SlotsPerFrm (7 ); + sscr0 =ssp_read_reg (ssp,SSCR0 ); + sscr0 &= ~(SSCR0_MOD |SSCR0_SlotsPerFrm (7 ) |SSCR0_EDSS |SSCR0_DSS ); + +/* set slot width */ +if (slot_width >16 ) + sscr0 |=SSCR0_EDSS |SSCR0_DataSize (slot_width -16 ); +else + sscr0 |=SSCR0_DataSize (slot_width); -/* set number of active slots */ - sscr0 |=SSCR0_SlotsPerFrm (slots); +if (slots >1 ) { +/* enable network mode */ + sscr0 |=SSCR0_MOD ; + +/* set number of active slots */ + sscr0 |=SSCR0_SlotsPerFrm (slots); + +/* set active slot mask */ +ssp_write_reg (ssp,SSTSA , tx_mask); +ssp_write_reg (ssp,SSRSA , rx_mask); + }ssp_write_reg (ssp,SSCR0 , sscr0); -/* set active slot mask */ -ssp_write_reg (ssp,SSTSA , mask); -ssp_write_reg (ssp,SSRSA , mask);return 0 ; }
sound/soc/soc-core.c +6 -3
@@ -2133,17 +2133,20 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);/** * snd_soc_dai_set_tdm_slot - configure DAI TDM. * @dai: DAI -* @mask: DAI specific mask representing used slots. +* @tx_mask: bitmask representing active TX slots. +* @rx_mask: bitmask representing active RX slots. * @slots: Number of slots in use. +* @slot_width: Width in bits for each slot. * * Configures a DAI for TDM operation. Both mask and slots are codec and DAI * specific. */ int snd_soc_dai_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {if (dai->ops && dai->ops->set_tdm_slot) -return dai->ops->set_tdm_slot (dai, mask, slots); +return dai->ops->set_tdm_slot (dai, tx_mask, rx_mask, + slots, slot_width);else return -EINVAL ; }
Signature · 5 lines
tg: (c787980..) asoc/set_tdm_slot (depends on: asoc/remove-code-duplication) -- Daniel Ribeiro
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 2 lines · Daniel Ribeiro
Extend
set_tdm_slotto allow the user to arbitrarily set the frame width and active TX/RX slots.
Looks good - I'll apply this unless someone else spots any issues. Unfortunately I'm not able to test the PXA changes right now.
Quoted 3 lines
Updates
magician.candwm9081.cfor the newset_tdm_slot().wm9081.cstill doesn't handle theslot_widthoverride, I will submit this as a separate patch after I figure how to handle the I2S case.
There's no need for you to spend time looking at this, I'll take care of it.
Quoted 153 lines
(this series is meant for Mark's for-2.6.32 branch + "remove duplicated code" patch I sent yesterday)
Signed-off-by Daniel Ribeiro <[email protected]>--- include/sound/soc-dai.h | 5 +++-- sound/soc/codecs/wm9081.c | 5 +++-- sound/soc/pxa/magician.c | 2 +- sound/soc/pxa/pxa-ssp.c | 27 ++++++++++++++++++++------- sound/soc/soc-core.c | 9 ++++++--- 5 files changed, 33 insertions(+), 15 deletions(-)include/sound/soc-dai.h +3
-2@@ -106,7 +106,7 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai,int snd_soc_dai_set_fmt (struct snd_soc_dai *dai,unsigned int fmt);int snd_soc_dai_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots); +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width);int snd_soc_dai_set_tristate (struct snd_soc_dai *dai,int tristate);@@ -140,7 +140,8 @@ struct snd_soc_dai_ops {*/ int (*set_fmt)(struct snd_soc_dai *dai,unsigned int fmt);int (*set_tdm_slot)(struct snd_soc_dai *dai, -unsigned int mask,int slots); +unsigned int tx_mask,unsigned int rx_mask, +int slots,int slot_width);int (*set_tristate)(struct snd_soc_dai *dai,int tristate);/* sound/soc/codecs/wm9081.c +3
-2@@ -1206,8 +1206,9 @@ static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai,return 0 ; } +/* FIXME: Needs to handle slot_width */ static int wm9081_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {struct snd_soc_codec *codec = dai->codec;unsigned int aif1 =wm9081_read (codec,WM9081_AUDIO_INTERFACE_1 );@@ -1219,7 +1220,7 @@ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, aif1 |= (slots -1 ) <<WM9081_AIFDAC_TDM_MODE_SHIFT ; -switch (mask) { +switch (rx_mask) {case 1 :break ;case 2 :sound/soc/pxa/magician.c +1
-1@@ -188,7 +188,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,if (ret <0 )return ret; - ret =snd_soc_dai_set_tdm_slot (cpu_dai,1 ,1 ); + ret =snd_soc_dai_set_tdm_slot (cpu_dai,1 ,0 ,1 , width);if (ret <0 )return ret;sound/soc/pxa/pxa-ssp.c +20
-7@@ -375,21 +375,34 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,* Set the active slots in TDM/Network mode */ static int pxa_ssp_set_dai_tdm_slot (struct snd_soc_dai *cpu_dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {struct ssp_priv *priv = cpu_dai->private_data;struct ssp_device *ssp = priv->dev.ssp;u32 sscr0; - sscr0 =ssp_read_reg (ssp,SSCR0 ) & ~SSCR0_SlotsPerFrm (7 ); + sscr0 =ssp_read_reg (ssp,SSCR0 ); + sscr0 &= ~(SSCR0_MOD |SSCR0_SlotsPerFrm (7 ) |SSCR0_EDSS |SSCR0_DSS ); + +/* set slot width */ +if (slot_width >16 ) + sscr0 |=SSCR0_EDSS |SSCR0_DataSize (slot_width -16 ); +else + sscr0 |=SSCR0_DataSize (slot_width); -/* set number of active slots */ - sscr0 |=SSCR0_SlotsPerFrm (slots); +if (slots >1 ) { +/* enable network mode */ + sscr0 |=SSCR0_MOD ; + +/* set number of active slots */ + sscr0 |=SSCR0_SlotsPerFrm (slots); + +/* set active slot mask */ +ssp_write_reg (ssp,SSTSA , tx_mask); +ssp_write_reg (ssp,SSRSA , rx_mask); + }ssp_write_reg (ssp,SSCR0 , sscr0); -/* set active slot mask */ -ssp_write_reg (ssp,SSTSA , mask); -ssp_write_reg (ssp,SSRSA , mask);return 0 ; }sound/soc/soc-core.c +6
-3@@ -2133,17 +2133,20 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);/** * snd_soc_dai_set_tdm_slot - configure DAI TDM. * @dai: DAI -* @mask: DAI specific mask representing used slots. +* @tx_mask: bitmask representing active TX slots. +* @rx_mask: bitmask representing active RX slots. * @slots: Number of slots in use. +* @slot_width: Width in bits for each slot. * * Configures a DAI for TDM operation. Both mask and slots are codec and DAI * specific. */ int snd_soc_dai_set_tdm_slot (struct snd_soc_dai *dai, -unsigned int mask,int slots) +unsigned int tx_mask,unsigned int rx_mask,int slots,int slot_width) {if (dai->ops && dai->ops->set_tdm_slot) -return dai->ops->set_tdm_slot (dai, mask, slots); +return dai->ops->set_tdm_slot (dai, tx_mask, rx_mask, + slots, slot_width);else return -EINVAL ; }Signature · 5 lines
tg: (c787980..) asoc/set_tdm_slot (depends on: asoc/remove-code-duplication) -- Daniel Ribeiro
Signature · 1 line
"You grabbed my hand and we fell into it, like a daydream - or a fever."
Em Qui, 2009-06-11 às 13:07 +0100, Mark Brown escreveu:
Quoted 6 lines · Daniel Ribeiro
Quoted 2 lines
Extend
set_tdm_slotto allow the user to arbitrarily set the frame width and active TX/RX slots.Looks good - I'll apply this unless someone else spots any issues. Unfortunately I'm not able to test the PXA changes right now.
Thanks!
Please note that this patch is useless without the next one (2/2), as ssp_hw_params will not respect the slot_width set by set_tdm_slot().
Quoted 6 lines
Quoted 3 lines
Updates
magician.candwm9081.cfor the newset_tdm_slot().wm9081.cstill doesn't handle theslot_widthoverride, I will submit this as a separate patch after I figure how to handle the I2S case.There's no need for you to spend time looking at this, I'll take care of it.
Ok, thanks!
Signature · 1 line
Daniel Ribeiro
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel