On Wed, Sep 30, 2015 at 07:50:58PM +0200, codekipper@gmail.com wrote:
From: Marcus Cooper codekipper@gmail.com
The sun4i, sun6i and sun7i SoC families have an SPDIF block which is capable of playback and capture.
This patch enables the playback of this block for the sun4i and sun7i families.
Signed-off-by: Marcus Cooper codekipper@gmail.com
sound/soc/sunxi/Kconfig | 12 + sound/soc/sunxi/Makefile | 4 + sound/soc/sunxi/sun4i-spdif.c | 612 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 628 insertions(+) create mode 100644 sound/soc/sunxi/sun4i-spdif.c
diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig index 84c72ec..2ebf43d 100644 --- a/sound/soc/sunxi/Kconfig +++ b/sound/soc/sunxi/Kconfig @@ -8,4 +8,16 @@ config SND_SUN4I_CODEC Select Y or M to add support for the Codec embedded in the Allwinner A10 and affiliated SoCs.
+config SND_SOC_SUNXI_DAI_SPDIF
tristate- depends on OF
select SND_SOC_GENERIC_DMAENGINE_PCMselect REGMAP_MMIO+config SND_SOC_SUNXI_MACHINE_SPDIF
tristate "APB on-chip sun4i/sun5i/sun7i SPDIF"- depends on OF
select SND_SOC_SUNXI_DAI_SPDIFhelpSay Y if you want to add support for SoC S/PDIF audio as simple audio card.
You still haven't said why you can't use simple-card...
+static void sun4i_spdif_configure(struct sun4i_spdif_dev *host) +{
- u32 reg_val;
- /* soft reset SPDIF */
- regmap_write(host->regmap, SUN4I_SPDIF_CTL, SUN4I_SPDIF_CTL_RESET);
- /* MCLK OUTPUT enable */
- regmap_update_bits(host->regmap, SUN4I_SPDIF_CTL,
SUN4I_SPDIF_CTL_MCLKOUTEN, SUN4I_SPDIF_CTL_MCLKOUTEN);
The alignment is still not right....
- /* flush TX FIFO */
- regmap_update_bits(host->regmap, SUN4I_SPDIF_FCTL,
SUN4I_SPDIF_FCTL_FTX, SUN4I_SPDIF_FCTL_FTX);- /* clear interrupt status */
- regmap_read(host->regmap, SUN4I_SPDIF_ISTA, ®_val);
- regmap_write(host->regmap, SUN4I_SPDIF_ISTA, reg_val);
You're not using any interrupts. Why is this needed?
+static int sun4i_spdif_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *cpu_dai)+{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(rtd->cpu_dai);
- if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
return -EINVAL;- sun4i_spdif_configure(host);
- return clk_prepare_enable(host->clk);
You're still not using pm_runtime...
+}
+static void sun4i_spdif_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)+{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(rtd->cpu_dai);
- if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
return;- clk_disable_unprepare(host->clk);
+}
+static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,struct snd_soc_dai *cpu_dai)+{
- int ret = 0;
- int fmt;
- unsigned long rate = params_rate(params);
- u32 mclk_div = 0;
- unsigned int mclk = 0;
- u32 reg_val;
- struct sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(cpu_dai);
- struct platform_device *pdev = host->pdev;
- /* Add the PCM and raw data select interface */
- switch (params_channels(params)) {
- case 1: /* PCM mode */
- case 2:
fmt = 0;break;- case 4: /* raw data mode */
fmt = SUN4I_SPDIF_TXCFG_NONAUDIO;break;- default:
return -EINVAL;- }
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
fmt |= SUN4I_SPDIF_TXCFG_FMT16BIT;break;- case SNDRV_PCM_FORMAT_S20_3LE:
fmt |= SUN4I_SPDIF_TXCFG_FMT20BIT;break;- case SNDRV_PCM_FORMAT_S24_LE:
fmt |= SUN4I_SPDIF_TXCFG_FMT24BIT;break;- default:
return -EINVAL;- }
- switch (rate) {
- case 22050:
- case 44100:
- case 88200:
- case 176400:
mclk = 22579200;break;- case 24000:
- case 32000:
- case 48000:
- case 96000:
- case 192000:
mclk = 24576000;break;- default:
return -EINVAL;- }
- ret = clk_set_rate(host->audio_clk, mclk);
- if (ret < 0) {
dev_err(&pdev->dev,"Setting pll2 clock rate for %d Hz failed!\n", mclk);return ret;- }
You're still using the PLL2...
- ret = clk_set_rate(host->clk, mclk);
- if (ret < 0) {
dev_err(&pdev->dev,"Setting SPDIF clock rate for %d Hz failed!\n", mclk);return ret;- }
- reg_val = 0;
- reg_val &= ~SUN4I_SPDIF_FCTL_FIFOSRC;
- reg_val |= SUN4I_SPDIF_FCTL_TXTL_MASK;
- reg_val |= SUN4I_SPDIF_FCTL_RXTL_MASK;
- reg_val |= SUN4I_SPDIF_FCTL_TXIM;
- reg_val |= SUN4I_SPDIF_FCTL_RXOM_MASK;
- regmap_write(host->regmap, SUN4I_SPDIF_FCTL, reg_val);
You're still not using regmap_update_bits...
IF you're really going to ignore all the comments we did, please tell us upfront. That way, we will not waste our time doing a review of your patches.
Maxime