Commit f6a86b43 authored by Clément Péron's avatar Clément Péron Committed by Mark Brown

ASoC: sun4i-spdif: Add TX fifo bit flush quirks

Allwinner H6 has a different bit to flush the TX FIFO.

Add a quirks to prepare introduction of H6 SoC.
Signed-off-by: default avatarClément Péron <peron.clem@gmail.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ae9cccc3
...@@ -166,10 +166,12 @@ ...@@ -166,10 +166,12 @@
* *
* @reg_dac_tx_data: TX FIFO offset for DMA config. * @reg_dac_tx_data: TX FIFO offset for DMA config.
* @has_reset: SoC needs reset deasserted. * @has_reset: SoC needs reset deasserted.
* @val_fctl_ftx: TX FIFO flush bitmask.
*/ */
struct sun4i_spdif_quirks { struct sun4i_spdif_quirks {
unsigned int reg_dac_txdata; unsigned int reg_dac_txdata;
bool has_reset; bool has_reset;
unsigned int val_fctl_ftx;
}; };
struct sun4i_spdif_dev { struct sun4i_spdif_dev {
...@@ -180,16 +182,19 @@ struct sun4i_spdif_dev { ...@@ -180,16 +182,19 @@ struct sun4i_spdif_dev {
struct snd_soc_dai_driver cpu_dai_drv; struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap; struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx; struct snd_dmaengine_dai_dma_data dma_params_tx;
const struct sun4i_spdif_quirks *quirks;
}; };
static void sun4i_spdif_configure(struct sun4i_spdif_dev *host) static void sun4i_spdif_configure(struct sun4i_spdif_dev *host)
{ {
const struct sun4i_spdif_quirks *quirks = host->quirks;
/* soft reset SPDIF */ /* soft reset SPDIF */
regmap_write(host->regmap, SUN4I_SPDIF_CTL, SUN4I_SPDIF_CTL_RESET); regmap_write(host->regmap, SUN4I_SPDIF_CTL, SUN4I_SPDIF_CTL_RESET);
/* flush TX FIFO */ /* flush TX FIFO */
regmap_update_bits(host->regmap, SUN4I_SPDIF_FCTL, regmap_update_bits(host->regmap, SUN4I_SPDIF_FCTL,
SUN4I_SPDIF_FCTL_FTX, SUN4I_SPDIF_FCTL_FTX); quirks->val_fctl_ftx, quirks->val_fctl_ftx);
/* clear TX counter */ /* clear TX counter */
regmap_write(host->regmap, SUN4I_SPDIF_TXCNT, 0); regmap_write(host->regmap, SUN4I_SPDIF_TXCNT, 0);
...@@ -418,15 +423,18 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { ...@@ -418,15 +423,18 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = {
static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = {
.reg_dac_txdata = SUN4I_SPDIF_TXFIFO, .reg_dac_txdata = SUN4I_SPDIF_TXFIFO,
.val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX,
}; };
static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = { static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = {
.reg_dac_txdata = SUN4I_SPDIF_TXFIFO, .reg_dac_txdata = SUN4I_SPDIF_TXFIFO,
.val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX,
.has_reset = true, .has_reset = true,
}; };
static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = { static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = {
.reg_dac_txdata = SUN8I_SPDIF_TXFIFO, .reg_dac_txdata = SUN8I_SPDIF_TXFIFO,
.val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX,
.has_reset = true, .has_reset = true,
}; };
...@@ -507,6 +515,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) ...@@ -507,6 +515,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); dev_err(&pdev->dev, "Failed to determine the quirks to use\n");
return -ENODEV; return -ENODEV;
} }
host->quirks = quirks;
host->regmap = devm_regmap_init_mmio(&pdev->dev, base, host->regmap = devm_regmap_init_mmio(&pdev->dev, base,
&sun4i_spdif_regmap_config); &sun4i_spdif_regmap_config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment