Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: pxa: i2s: use normal MMIO accessors

Browse Source 
To avoid dereferencing hardwired constant pointers from a global header
file, change the driver to use devm_platform_ioremap_resource for getting
an __iomem pointer, and then using readl/writel on that.

Each pointer dereference gets changed by a search&replace, which leads
to a few overlong lines, but seems less risky than trying to clean up
the code at the same time.

Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-09-18 10:52:31 +02:00
parent 8ff064521f
commit 85c6119912
1 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
sound/soc/pxa/pxa2xx-i2s.c
View File

@ -21,7 +21,6 @@
#include <sound/pxa2xx-lib.h> #include <sound/pxa2xx-lib.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <mach/pxa-regs.h>
#include <linux/platform_data/asoc-pxa.h> #include <linux/platform_data/asoc-pxa.h>
#include "pxa2xx-i2s.h" #include "pxa2xx-i2s.h"
@ -29,13 +28,13 @@
/* /*
* I2S Controller Register and Bit Definitions * I2S Controller Register and Bit Definitions
*/ */
#define SACR0 __REG(0x40400000) /* Global Control Register */ #define SACR0 (0x0000) /* Global Control Register */
#define SACR1 __REG(0x40400004) /* Serial Audio I 2 S/MSB-Justified Control Register */ #define SACR1 (0x0004) /* Serial Audio I 2 S/MSB-Justified Control Register */
#define SASR0 __REG(0x4040000C) /* Serial Audio I 2 S/MSB-Justified Interface and FIFO Status Register */ #define SASR0 (0x000C) /* Serial Audio I 2 S/MSB-Justified Interface and FIFO Status Register */
#define SAIMR __REG(0x40400014) /* Serial Audio Interrupt Mask Register */ #define SAIMR (0x0014) /* Serial Audio Interrupt Mask Register */
#define SAICR __REG(0x40400018) /* Serial Audio Interrupt Clear Register */ #define SAICR (0x0018) /* Serial Audio Interrupt Clear Register */
#define SADIV __REG(0x40400060) /* Audio Clock Divider Register. */ #define SADIV (0x0060) /* Audio Clock Divider Register. */
#define SADR __REG(0x40400080) /* Serial Audio Data Register (TX and RX FIFO access Register). */ #define SADR (0x0080) /* Serial Audio Data Register (TX and RX FIFO access Register). */
#define SACR0_RFTH(x) ((x) << 12) /* Rx FIFO Interrupt or DMA Trigger Threshold */ #define SACR0_RFTH(x) ((x) << 12) /* Rx FIFO Interrupt or DMA Trigger Threshold */
#define SACR0_TFTH(x) ((x) << 8) /* Tx FIFO Interrupt or DMA Trigger Threshold */ #define SACR0_TFTH(x) ((x) << 8) /* Tx FIFO Interrupt or DMA Trigger Threshold */
@ -77,16 +76,15 @@ struct pxa_i2s_port {
static struct pxa_i2s_port pxa_i2s; static struct pxa_i2s_port pxa_i2s;
static struct clk *clk_i2s; static struct clk *clk_i2s;
static int clk_ena = 0; static int clk_ena = 0;
static void __iomem *i2s_reg_base;
static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_out = { static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_out = {
.addr = __PREG(SADR),
.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
.chan_name = "tx", .chan_name = "tx",
.maxburst = 32, .maxburst = 32,
}; };
static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_in = { static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_in = {
.addr = __PREG(SADR),
.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
.chan_name = "rx", .chan_name = "rx",
.maxburst = 32, .maxburst = 32,
@ -102,7 +100,7 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream,
return PTR_ERR(clk_i2s); return PTR_ERR(clk_i2s);
if (!snd_soc_dai_active(cpu_dai)) if (!snd_soc_dai_active(cpu_dai))
SACR0 = 0; writel(0, i2s_reg_base + SACR0);
return 0; return 0;
} }
@ -114,7 +112,7 @@ static int pxa_i2s_wait(void)
/* flush the Rx FIFO */ /* flush the Rx FIFO */
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
SADR; readl(i2s_reg_base + SADR);
return 0; return 0;
} }
@ -174,39 +172,39 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
/* is port used by another stream */ /* is port used by another stream */
if (!(SACR0 & SACR0_ENB)) { if (!(SACR0 & SACR0_ENB)) {
SACR0 = 0; writel(0, i2s_reg_base + SACR0);
if (pxa_i2s.master) if (pxa_i2s.master)
SACR0 |= SACR0_BCKD; writel(readl(i2s_reg_base + SACR0) | (SACR0_BCKD), i2s_reg_base + SACR0);
SACR0 |= SACR0_RFTH(14) | SACR0_TFTH(1); writel(readl(i2s_reg_base + SACR0) | (SACR0_RFTH(14) | SACR0_TFTH(1)), i2s_reg_base + SACR0);
SACR1 |= pxa_i2s.fmt; writel(readl(i2s_reg_base + SACR1) | (pxa_i2s.fmt), i2s_reg_base + SACR1);
} }
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
SAIMR |= SAIMR_TFS; writel(readl(i2s_reg_base + SAIMR) | (SAIMR_TFS), i2s_reg_base + SAIMR);
else else
SAIMR |= SAIMR_RFS; writel(readl(i2s_reg_base + SAIMR) | (SAIMR_RFS), i2s_reg_base + SAIMR);
switch (params_rate(params)) { switch (params_rate(params)) {
case 8000: case 8000:
SADIV = 0x48; writel(0x48, i2s_reg_base + SADIV);
break; break;
case 11025: case 11025:
SADIV = 0x34; writel(0x34, i2s_reg_base + SADIV);
break; break;
case 16000: case 16000:
SADIV = 0x24; writel(0x24, i2s_reg_base + SADIV);
break; break;
case 22050: case 22050:
SADIV = 0x1a; writel(0x1a, i2s_reg_base + SADIV);
break; break;
case 44100: case 44100:
SADIV = 0xd; writel(0xd, i2s_reg_base + SADIV);
break; break;
case 48000: case 48000:
SADIV = 0xc; writel(0xc, i2s_reg_base + SADIV);
break; break;
case 96000: /* not in manual and possibly slightly inaccurate */ case 96000: /* not in manual and possibly slightly inaccurate */
SADIV = 0x6; writel(0x6, i2s_reg_base + SADIV);
break; break;
} }
@ -221,10 +219,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
SACR1 &= ~SACR1_DRPL; writel(readl(i2s_reg_base + SACR1) & (~SACR1_DRPL), i2s_reg_base + SACR1);
else else
SACR1 &= ~SACR1_DREC; writel(readl(i2s_reg_base + SACR1) & (~SACR1_DREC), i2s_reg_base + SACR1);
SACR0 |= SACR0_ENB; writel(readl(i2s_reg_base + SACR0) | (SACR0_ENB), i2s_reg_base + SACR0);
break; break;
case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
@ -243,15 +241,15 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
SACR1 |= SACR1_DRPL; writel(readl(i2s_reg_base + SACR1) | (SACR1_DRPL), i2s_reg_base + SACR1);
SAIMR &= ~SAIMR_TFS; writel(readl(i2s_reg_base + SAIMR) & (~SAIMR_TFS), i2s_reg_base + SAIMR);
} else { } else {
SACR1 |= SACR1_DREC; writel(readl(i2s_reg_base + SACR1) | (SACR1_DREC), i2s_reg_base + SACR1);
SAIMR &= ~SAIMR_RFS; writel(readl(i2s_reg_base + SAIMR) & (~SAIMR_RFS), i2s_reg_base + SAIMR);
} }
if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) { if ((readl(i2s_reg_base + SACR1) & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) {
SACR0 &= ~SACR0_ENB; writel(readl(i2s_reg_base + SACR0) & (~SACR0_ENB), i2s_reg_base + SACR0);
pxa_i2s_wait(); pxa_i2s_wait();
if (clk_ena) { if (clk_ena) {
clk_disable_unprepare(clk_i2s); clk_disable_unprepare(clk_i2s);
@ -264,13 +262,13 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream,
static int pxa2xx_soc_pcm_suspend(struct snd_soc_component *component) static int pxa2xx_soc_pcm_suspend(struct snd_soc_component *component)
{ {
/* store registers */ /* store registers */
pxa_i2s.sacr0 = SACR0; pxa_i2s.sacr0 = readl(i2s_reg_base + SACR0);
pxa_i2s.sacr1 = SACR1; pxa_i2s.sacr1 = readl(i2s_reg_base + SACR1);
pxa_i2s.saimr = SAIMR; pxa_i2s.saimr = readl(i2s_reg_base + SAIMR);
pxa_i2s.sadiv = SADIV; pxa_i2s.sadiv = readl(i2s_reg_base + SADIV);
/* deactivate link */ /* deactivate link */
SACR0 &= ~SACR0_ENB; writel(readl(i2s_reg_base + SACR0) & (~SACR0_ENB), i2s_reg_base + SACR0);
pxa_i2s_wait(); pxa_i2s_wait();
return 0; return 0;
} }
@ -279,12 +277,12 @@ static int pxa2xx_soc_pcm_resume(struct snd_soc_component *component)
{ {
pxa_i2s_wait(); pxa_i2s_wait();
SACR0 = pxa_i2s.sacr0 & ~SACR0_ENB; writel(pxa_i2s.sacr0 & ~SACR0_ENB, i2s_reg_base + SACR0);
SACR1 = pxa_i2s.sacr1; writel(pxa_i2s.sacr1, i2s_reg_base + SACR1);
SAIMR = pxa_i2s.saimr; writel(pxa_i2s.saimr, i2s_reg_base + SAIMR);
SADIV = pxa_i2s.sadiv; writel(pxa_i2s.sadiv, i2s_reg_base + SADIV);
SACR0 = pxa_i2s.sacr0; writel(pxa_i2s.sacr0, i2s_reg_base + SACR0);
return 0; return 0;
} }
@ -306,12 +304,12 @@ static int pxa2xx_i2s_probe(struct snd_soc_dai *dai)
* the SACR0[RST] bit must also be set and cleared to reset all * the SACR0[RST] bit must also be set and cleared to reset all
* I2S controller registers. * I2S controller registers.
*/ */
SACR0 = SACR0_RST; writel(SACR0_RST, i2s_reg_base + SACR0);
SACR0 = 0; writel(0, i2s_reg_base + SACR0);
/* Make sure RPL and REC are disabled */ /* Make sure RPL and REC are disabled */
SACR1 = SACR1_DRPL | SACR1_DREC; writel(SACR1_DRPL | SACR1_DREC, i2s_reg_base + SACR1);
/* Along with FIFO servicing */ /* Along with FIFO servicing */
SAIMR &= ~(SAIMR_RFS | SAIMR_TFS); writel(readl(i2s_reg_base + SAIMR) & (~(SAIMR_RFS | SAIMR_TFS)), i2s_reg_base + SAIMR);
snd_soc_dai_init_dma_data(dai, &pxa2xx_i2s_pcm_stereo_out, snd_soc_dai_init_dma_data(dai, &pxa2xx_i2s_pcm_stereo_out,
&pxa2xx_i2s_pcm_stereo_in); &pxa2xx_i2s_pcm_stereo_in);
@ -371,6 +369,22 @@ static const struct snd_soc_component_driver pxa_i2s_component = {
static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
{ {
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "missing MMIO resource\n");
return -ENXIO;
}
i2s_reg_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(i2s_reg_base)) {
dev_err(&pdev->dev, "ioremap failed\n");
return PTR_ERR(i2s_reg_base);
}
pxa2xx_i2s_pcm_stereo_out.addr = res->start + SADR;
pxa2xx_i2s_pcm_stereo_in.addr = res->start + SADR;
return devm_snd_soc_register_component(&pdev->dev, &pxa_i2s_component, return devm_snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
&pxa_i2s_dai, 1); &pxa_i2s_dai, 1);
} }