ASoC: stm32: sai: Add synchronization support
Add Synchronization support for STM32 SAI. Signed-off-by: olivier moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:

committed by
Mark Brown

parent
47a8907d7c
commit
5914d285f6
@@ -55,6 +55,12 @@
|
||||
#define STM_SAI_IS_SUB_B(x) ((x)->id == STM_SAI_B_ID)
|
||||
#define STM_SAI_BLOCK_NAME(x) (((x)->id == STM_SAI_A_ID) ? "A" : "B")
|
||||
|
||||
#define SAI_SYNC_NONE 0x0
|
||||
#define SAI_SYNC_INTERNAL 0x1
|
||||
#define SAI_SYNC_EXTERNAL 0x2
|
||||
|
||||
#define STM_SAI_HAS_EXT_SYNC(x) (!STM_SAI_IS_F4(sai->pdata))
|
||||
|
||||
/**
|
||||
* struct stm32_sai_sub_data - private data of SAI sub block (block A or B)
|
||||
* @pdev: device data pointer
|
||||
@@ -65,6 +71,7 @@
|
||||
* @cpu_dai: DAI runtime data pointer
|
||||
* @substream: PCM substream data pointer
|
||||
* @pdata: SAI block parent data pointer
|
||||
* @np_sync_provider: synchronization provider node
|
||||
* @sai_ck: kernel clock feeding the SAI clock generator
|
||||
* @phys_addr: SAI registers physical base address
|
||||
* @mclk_rate: SAI block master clock frequency (Hz). set at init
|
||||
@@ -73,6 +80,8 @@
|
||||
* @master: SAI block mode flag. (true=master, false=slave) set at init
|
||||
* @fmt: SAI block format. relevant only for custom protocols. set at init
|
||||
* @sync: SAI block synchronization mode. (none, internal or external)
|
||||
* @synco: SAI block ext sync source (provider setting). (none, sub-block A/B)
|
||||
* @synci: SAI block ext sync source (client setting). (SAI sync provider index)
|
||||
* @fs_length: frame synchronization length. depends on protocol settings
|
||||
* @slots: rx or tx slot number
|
||||
* @slot_width: rx or tx slot width in bits
|
||||
@@ -88,6 +97,7 @@ struct stm32_sai_sub_data {
|
||||
struct snd_soc_dai *cpu_dai;
|
||||
struct snd_pcm_substream *substream;
|
||||
struct stm32_sai_data *pdata;
|
||||
struct device_node *np_sync_provider;
|
||||
struct clk *sai_ck;
|
||||
dma_addr_t phys_addr;
|
||||
unsigned int mclk_rate;
|
||||
@@ -96,6 +106,8 @@ struct stm32_sai_sub_data {
|
||||
bool master;
|
||||
int fmt;
|
||||
int sync;
|
||||
int synco;
|
||||
int synci;
|
||||
int fs_length;
|
||||
int slots;
|
||||
int slot_width;
|
||||
@@ -387,6 +399,14 @@ static int stm32_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
|
||||
fmt & SND_SOC_DAIFMT_MASTER_MASK);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Set slave mode if sub-block is synchronized with another SAI */
|
||||
if (sai->sync) {
|
||||
dev_dbg(cpu_dai->dev, "Synchronized SAI configured as slave\n");
|
||||
cr1 |= SAI_XCR1_SLAVE;
|
||||
sai->master = false;
|
||||
}
|
||||
|
||||
cr1_mask |= SAI_XCR1_SLAVE;
|
||||
|
||||
/* do not generate master by default */
|
||||
@@ -749,6 +769,16 @@ static int stm32_sai_dai_probe(struct snd_soc_dai *cpu_dai)
|
||||
if (STM_SAI_IS_CAPTURE(sai))
|
||||
cr1 |= SAI_XCR1_RX_TX;
|
||||
|
||||
/* Configure synchronization */
|
||||
if (sai->sync == SAI_SYNC_EXTERNAL) {
|
||||
/* Configure synchro client and provider */
|
||||
sai->pdata->set_sync(sai->pdata, sai->np_sync_provider,
|
||||
sai->synco, sai->synci);
|
||||
}
|
||||
|
||||
cr1_mask |= SAI_XCR1_SYNCEN_MASK;
|
||||
cr1 |= SAI_XCR1_SYNCEN_SET(sai->sync);
|
||||
|
||||
return regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, cr1_mask, cr1);
|
||||
}
|
||||
|
||||
@@ -835,6 +865,8 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct resource *res;
|
||||
void __iomem *base;
|
||||
struct of_phandle_args args;
|
||||
int ret;
|
||||
|
||||
if (!np)
|
||||
return -ENODEV;
|
||||
@@ -868,6 +900,69 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Get synchronization property */
|
||||
args.np = NULL;
|
||||
ret = of_parse_phandle_with_fixed_args(np, "st,sync", 1, 0, &args);
|
||||
if (ret < 0 && ret != -ENOENT) {
|
||||
dev_err(&pdev->dev, "Failed to get st,sync property\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
sai->sync = SAI_SYNC_NONE;
|
||||
if (args.np) {
|
||||
if (args.np == np) {
|
||||
dev_err(&pdev->dev, "%s sync own reference\n",
|
||||
np->name);
|
||||
of_node_put(args.np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sai->np_sync_provider = of_get_parent(args.np);
|
||||
if (!sai->np_sync_provider) {
|
||||
dev_err(&pdev->dev, "%s parent node not found\n",
|
||||
np->name);
|
||||
of_node_put(args.np);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
sai->sync = SAI_SYNC_INTERNAL;
|
||||
if (sai->np_sync_provider != sai->pdata->pdev->dev.of_node) {
|
||||
if (!STM_SAI_HAS_EXT_SYNC(sai)) {
|
||||
dev_err(&pdev->dev,
|
||||
"External synchro not supported\n");
|
||||
of_node_put(args.np);
|
||||
return -EINVAL;
|
||||
}
|
||||
sai->sync = SAI_SYNC_EXTERNAL;
|
||||
|
||||
sai->synci = args.args[0];
|
||||
if (sai->synci < 1 ||
|
||||
(sai->synci > (SAI_GCR_SYNCIN_MAX + 1))) {
|
||||
dev_err(&pdev->dev, "Wrong SAI index\n");
|
||||
of_node_put(args.np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (of_property_match_string(args.np, "compatible",
|
||||
"st,stm32-sai-sub-a") >= 0)
|
||||
sai->synco = STM_SAI_SYNC_OUT_A;
|
||||
|
||||
if (of_property_match_string(args.np, "compatible",
|
||||
"st,stm32-sai-sub-b") >= 0)
|
||||
sai->synco = STM_SAI_SYNC_OUT_B;
|
||||
|
||||
if (!sai->synco) {
|
||||
dev_err(&pdev->dev, "Unknown SAI sub-block\n");
|
||||
of_node_put(args.np);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "%s synchronized with %s\n",
|
||||
pdev->name, args.np->full_name);
|
||||
}
|
||||
|
||||
of_node_put(args.np);
|
||||
sai->sai_ck = devm_clk_get(&pdev->dev, "sai_ck");
|
||||
if (IS_ERR(sai->sai_ck)) {
|
||||
dev_err(&pdev->dev, "Missing kernel clock sai_ck\n");
|
||||
|
Reference in New Issue
Block a user