mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 15:49:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: stm32: sai: add stm32mp25 support

Browse Source 
Merge series from Olivier Moysan <olivier.moysan@foss.st.com>:

Update STM32 SAI driver and binding to support STM32MP25 SoCs.
This commit is contained in:
Mark Brown
2024-11-09 01:48:58 +00:00
parent 79ef7a4cd6 2cfe1ff225
commit b3ea5bec75
4 changed files with 216 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/devicetree/bindings/sound/st,stm32-sai.yaml
View File

@@ -20,6 +20,7 @@ properties:
enum:
- st,stm32f4-sai
- st,stm32h7-sai
- st,stm32mp25-sai
reg:
items:
@@ -43,9 +44,11 @@ properties:
const: 1
clocks:
minItems: 1
maxItems: 3
clock-names:
minItems: 1
maxItems: 3
access-controllers:
@@ -156,7 +159,13 @@ allOf:
items:
- const: x8k
- const: x11k
else:
- if:
properties:
compatible:
contains:
const: st,stm32mph7-sai
then:
properties:
clocks:
items:
@@ -170,6 +179,21 @@ allOf:
- const: x8k
- const: x11k
- if:
properties:
compatible:
contains:
const: st,stm32mp25-sai
then:
properties:
clocks:
items:
- description: pclk feeds the peripheral bus interface.
clock-names:
items:
- const: pclk
additionalProperties: false
examples:

58
sound/soc/stm/stm32_sai.c
View File

@@ -19,26 +19,42 @@
#include "stm32_sai.h"
static int stm32_sai_get_parent_clk(struct stm32_sai_data *sai);
static const struct stm32_sai_conf stm32_sai_conf_f4 = {
.version = STM_SAI_STM32F4,
.fifo_size = 8,
.has_spdif_pdm = false,
.get_sai_ck_parent = stm32_sai_get_parent_clk,
};
/*
* Default settings for stm32 H7 socs and next.
* Default settings for STM32H7x socs and STM32MP1x.
* These default settings will be overridden if the soc provides
* support of hardware configuration registers.
* - STM32H7: rely on default settings
* - STM32MP1: retrieve settings from registers
*/
static const struct stm32_sai_conf stm32_sai_conf_h7 = {
.version = STM_SAI_STM32H7,
.fifo_size = 8,
.has_spdif_pdm = true,
.get_sai_ck_parent = stm32_sai_get_parent_clk,
};
/*
* STM32MP2x:
* - do not use SAI parent clock source selection
* - do not use DMA burst mode
*/
static const struct stm32_sai_conf stm32_sai_conf_mp25 = {
.no_dma_burst = true,
};
static const struct of_device_id stm32_sai_ids[] = {
{ .compatible = "st,stm32f4-sai", .data = (void *)&stm32_sai_conf_f4 },
{ .compatible = "st,stm32h7-sai", .data = (void *)&stm32_sai_conf_h7 },
{ .compatible = "st,stm32mp25-sai", .data = (void *)&stm32_sai_conf_mp25 },
{}
};
@@ -148,6 +164,29 @@ static int stm32_sai_set_sync(struct stm32_sai_data *sai_client,
return ret;
}
static int stm32_sai_get_parent_clk(struct stm32_sai_data *sai)
{
struct device *dev = &sai->pdev->dev;
sai->clk_x8k = devm_clk_get(dev, "x8k");
if (IS_ERR(sai->clk_x8k)) {
if (PTR_ERR(sai->clk_x8k) != -EPROBE_DEFER)
dev_err(dev, "missing x8k parent clock: %ld\n",
PTR_ERR(sai->clk_x8k));
return PTR_ERR(sai->clk_x8k);
}
sai->clk_x11k = devm_clk_get(dev, "x11k");
if (IS_ERR(sai->clk_x11k)) {
if (PTR_ERR(sai->clk_x11k) != -EPROBE_DEFER)
dev_err(dev, "missing x11k parent clock: %ld\n",
PTR_ERR(sai->clk_x11k));
return PTR_ERR(sai->clk_x11k);
}
return 0;
}
static int stm32_sai_probe(struct platform_device *pdev)
{
struct stm32_sai_data *sai;
@@ -160,6 +199,8 @@ static int stm32_sai_probe(struct platform_device *pdev)
if (!sai)
return -ENOMEM;
sai->pdev = pdev;
sai->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(sai->base))
return PTR_ERR(sai->base);
@@ -178,15 +219,11 @@ static int stm32_sai_probe(struct platform_device *pdev)
"missing bus clock pclk\n");
}
sai->clk_x8k = devm_clk_get(&pdev->dev, "x8k");
if (IS_ERR(sai->clk_x8k))
return dev_err_probe(&pdev->dev, PTR_ERR(sai->clk_x8k),
"missing x8k parent clock\n");
sai->clk_x11k = devm_clk_get(&pdev->dev, "x11k");
if (IS_ERR(sai->clk_x11k))
return dev_err_probe(&pdev->dev, PTR_ERR(sai->clk_x11k),
"missing x11k parent clock\n");
if (sai->conf.get_sai_ck_parent) {
ret = sai->conf.get_sai_ck_parent(sai);
if (ret)
return ret;
}
/* init irqs */
sai->irq = platform_get_irq(pdev, 0);
@@ -227,7 +264,6 @@ static int stm32_sai_probe(struct platform_device *pdev)
}
clk_disable_unprepare(sai->pclk);
sai->pdev = pdev;
sai->set_sync = &stm32_sai_set_sync;
platform_set_drvdata(pdev, sai);

6
sound/soc/stm/stm32_sai.h
View File

@@ -264,16 +264,22 @@ enum stm32_sai_syncout {
STM_SAI_SYNC_OUT_B,
};
struct stm32_sai_data;
/**
* struct stm32_sai_conf - SAI configuration
* @get_sai_ck_parent: get parent clock of SAI kernel clock
* @version: SAI version
* @fifo_size: SAI fifo size as words number
* @has_spdif_pdm: SAI S/PDIF and PDM features support flag
* @no_dma_burst: Support only DMA single transfers if set
*/
struct stm32_sai_conf {
int (*get_sai_ck_parent)(struct stm32_sai_data *sai);
u32 version;
u32 fifo_size;
bool has_spdif_pdm;
bool no_dma_burst;
};
/**

144
sound/soc/stm/stm32_sai_sub.c
View File

@@ -60,6 +60,9 @@
#define SAI_MCLK_NAME_LEN 32
#define SAI_RATE_11K 11025
#define SAI_MAX_SAMPLE_RATE_8K 192000
#define SAI_MAX_SAMPLE_RATE_11K 176400
#define SAI_CK_RATE_TOLERANCE 1000 /* ppm */
/**
* struct stm32_sai_sub_data - private data of SAI sub block (block A or B)
@@ -80,6 +83,7 @@
* @dir: SAI block direction (playback or capture). set at init
* @master: SAI block mode flag. (true=master, false=slave) set at init
* @spdif: SAI S/PDIF iec60958 mode flag. set at init
* @sai_ck_used: flag set while exclusivity on SAI kernel clock is active
* @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)
@@ -93,6 +97,8 @@
* @iec958: iec958 data
* @ctrl_lock: control lock
* @irq_lock: prevent race condition with IRQ
* @set_sai_ck_rate: set SAI kernel clock rate
* @put_sai_ck_rate: put SAI kernel clock rate
*/
struct stm32_sai_sub_data {
struct platform_device *pdev;
@@ -112,6 +118,7 @@ struct stm32_sai_sub_data {
int dir;
bool master;
bool spdif;
bool sai_ck_used;
int fmt;
int sync;
int synco;
@@ -125,6 +132,8 @@ struct stm32_sai_sub_data {
struct snd_aes_iec958 iec958;
struct mutex ctrl_lock; /* protect resources accessed by controls */
spinlock_t irq_lock; /* used to prevent race condition with IRQ */
int (*set_sai_ck_rate)(struct stm32_sai_sub_data *sai, unsigned int rate);
void (*put_sai_ck_rate)(struct stm32_sai_sub_data *sai);
};
enum stm32_sai_fifo_th {
@@ -351,8 +360,26 @@ static int stm32_sai_set_clk_div(struct stm32_sai_sub_data *sai,
return ret;
}
static int stm32_sai_set_parent_clock(struct stm32_sai_sub_data *sai,
unsigned int rate)
static bool stm32_sai_rate_accurate(unsigned int max_rate, unsigned int rate)
{
u64 delta, dividend;
int ratio;
ratio = DIV_ROUND_CLOSEST(max_rate, rate);
if (!ratio)
return false;
dividend = mul_u32_u32(1000000, abs(max_rate - (ratio * rate)));
delta = div_u64(dividend, max_rate);
if (delta <= SAI_CK_RATE_TOLERANCE)
return true;
return false;
}
static int stm32_sai_set_parent_clk(struct stm32_sai_sub_data *sai,
unsigned int rate)
{
struct platform_device *pdev = sai->pdev;
struct clk *parent_clk = sai->pdata->clk_x8k;
@@ -370,6 +397,92 @@ static int stm32_sai_set_parent_clock(struct stm32_sai_sub_data *sai,
return ret;
}
static void stm32_sai_put_parent_rate(struct stm32_sai_sub_data *sai)
{
if (sai->sai_ck_used) {
sai->sai_ck_used = false;
clk_rate_exclusive_put(sai->sai_ck);
}
}
static int stm32_sai_set_parent_rate(struct stm32_sai_sub_data *sai,
unsigned int rate)
{
struct platform_device *pdev = sai->pdev;
unsigned int sai_ck_rate, sai_ck_max_rate, sai_curr_rate, sai_new_rate;
int div, ret;
/*
* Set maximum expected kernel clock frequency
* - mclk on or spdif:
* f_sai_ck = MCKDIV * mclk-fs * fs
* Here typical 256 ratio is assumed for mclk-fs
* - mclk off:
* f_sai_ck = MCKDIV * FRL * fs
* Where FRL=[8..256], MCKDIV=[1..n] (n depends on SAI version)
* Set constraint MCKDIV * FRL <= 256, to ensure MCKDIV is in available range
* f_sai_ck = sai_ck_max_rate * pow_of_two(FRL) / 256
*/
if (!(rate % SAI_RATE_11K))
sai_ck_max_rate = SAI_MAX_SAMPLE_RATE_11K * 256;
else
sai_ck_max_rate = SAI_MAX_SAMPLE_RATE_8K * 256;
if (!sai->sai_mclk && !STM_SAI_PROTOCOL_IS_SPDIF(sai))
sai_ck_max_rate /= DIV_ROUND_CLOSEST(256, roundup_pow_of_two(sai->fs_length));
/*
* Request exclusivity, as the clock is shared by SAI sub-blocks and by
* some SAI instances. This allows to ensure that the rate cannot be
* changed while one or more SAIs are using the clock.
*/
clk_rate_exclusive_get(sai->sai_ck);
sai->sai_ck_used = true;
/*
* Check current kernel clock rate. If it gives the expected accuracy
* return immediately.
*/
sai_curr_rate = clk_get_rate(sai->sai_ck);
if (stm32_sai_rate_accurate(sai_ck_max_rate, sai_curr_rate))
return 0;
/*
* Otherwise try to set the maximum rate and check the new actual rate.
* If the new rate does not give the expected accuracy, try to set
* lower rates for the kernel clock.
*/
sai_ck_rate = sai_ck_max_rate;
div = 1;
do {
/* Check new rate accuracy. Return if ok */
sai_new_rate = clk_round_rate(sai->sai_ck, sai_ck_rate);
if (stm32_sai_rate_accurate(sai_ck_rate, sai_new_rate)) {
ret = clk_set_rate(sai->sai_ck, sai_ck_rate);
if (ret) {
dev_err(&pdev->dev, "Error %d setting sai_ck rate. %s",
ret, ret == -EBUSY ?
"Active stream rates may be in conflict\n" : "\n");
goto err;
}
return 0;
}
/* Try a lower frequency */
div++;
sai_ck_rate = sai_ck_max_rate / div;
} while (sai_ck_rate > rate);
/* No accurate rate found */
dev_err(&pdev->dev, "Failed to find an accurate rate");
err:
stm32_sai_put_parent_rate(sai);
return -EINVAL;
}
static long stm32_sai_mclk_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *prate)
{
@@ -565,11 +678,15 @@ static int stm32_sai_set_sysclk(struct snd_soc_dai *cpu_dai,
clk_rate_exclusive_put(sai->sai_mclk);
sai->mclk_rate = 0;
}
if (sai->put_sai_ck_rate)
sai->put_sai_ck_rate(sai);
return 0;
}
/* If master clock is used, set parent clock now */
ret = stm32_sai_set_parent_clock(sai, freq);
/* If master clock is used, configure SAI kernel clock now */
ret = sai->set_sai_ck_rate(sai, freq);
if (ret)
return ret;
@@ -993,7 +1110,7 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai,
int ret;
if (!sai->sai_mclk) {
ret = stm32_sai_set_parent_clock(sai, rate);
ret = sai->set_sai_ck_rate(sai, rate);
if (ret)
return ret;
}
@@ -1154,6 +1271,14 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream,
clk_disable_unprepare(sai->sai_ck);
/*
* Release kernel clock if following conditions are fulfilled
* - Master clock is not used. Kernel clock won't be released trough sysclk
* - Put handler is defined. Involve that clock is managed exclusively
*/
if (!sai->sai_mclk && sai->put_sai_ck_rate)
sai->put_sai_ck_rate(sai);
spin_lock_irqsave(&sai->irq_lock, flags);
sai->substream = NULL;
spin_unlock_irqrestore(&sai->irq_lock, flags);
@@ -1188,7 +1313,7 @@ static int stm32_sai_dai_probe(struct snd_soc_dai *cpu_dai)
* constraints).
*/
sai->dma_params.maxburst = 4;
if (sai->pdata->conf.fifo_size < 8)
if (sai->pdata->conf.fifo_size < 8 || sai->pdata->conf.no_dma_burst)
sai->dma_params.maxburst = 1;
/* Buswidth will be set by framework at runtime */
sai->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_UNDEFINED;
@@ -1526,6 +1651,13 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
return -EINVAL;
}
if (sai->pdata->conf.get_sai_ck_parent) {
sai->set_sai_ck_rate = stm32_sai_set_parent_clk;
} else {
sai->set_sai_ck_rate = stm32_sai_set_parent_rate;
sai->put_sai_ck_rate = stm32_sai_put_parent_rate;
}
ret = stm32_sai_sub_parse_of(pdev, sai);
if (ret)
return ret;