Commit cebe7767 authored by Jon Smirl's avatar Jon Smirl Committed by Mark Brown

ASoC: Rename the PSC functions to DMA

Rename the functions in the mpc5200 DMA file from i2s based names to dma
ones to reflect the file they are in.
Signed-off-by: default avatarJon Smirl <jonsmirl@gmail.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 89dd0842
This diff is collapsed.
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#define __SOUND_SOC_FSL_MPC5200_DMA_H__ #define __SOUND_SOC_FSL_MPC5200_DMA_H__
/** /**
* psc_i2s_stream - Data specific to a single stream (playback or capture) * psc_dma_stream - Data specific to a single stream (playback or capture)
* @active: flag indicating if the stream is active * @active: flag indicating if the stream is active
* @psc_i2s: pointer back to parent psc_i2s data structure * @psc_dma: pointer back to parent psc_dma data structure
* @bcom_task: bestcomm task structure * @bcom_task: bestcomm task structure
* @irq: irq number for bestcomm task * @irq: irq number for bestcomm task
* @period_start: physical address of start of DMA region * @period_start: physical address of start of DMA region
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* @period_next_pt: physical address of next DMA buffer to enqueue * @period_next_pt: physical address of next DMA buffer to enqueue
* @period_bytes: size of DMA period in bytes * @period_bytes: size of DMA period in bytes
*/ */
struct psc_i2s_stream { struct psc_dma_stream {
int active; int active;
struct psc_i2s *psc_i2s; struct psc_dma *psc_dma;
struct bcom_task *bcom_task; struct bcom_task *bcom_task;
int irq; int irq;
struct snd_pcm_substream *stream; struct snd_pcm_substream *stream;
...@@ -30,7 +30,7 @@ struct psc_i2s_stream { ...@@ -30,7 +30,7 @@ struct psc_i2s_stream {
}; };
/** /**
* psc_i2s - Private driver data * psc_dma - Private driver data
* @name: short name for this device ("PSC0", "PSC1", etc) * @name: short name for this device ("PSC0", "PSC1", etc)
* @psc_regs: pointer to the PSC's registers * @psc_regs: pointer to the PSC's registers
* @fifo_regs: pointer to the PSC's FIFO registers * @fifo_regs: pointer to the PSC's FIFO registers
...@@ -42,7 +42,7 @@ struct psc_i2s_stream { ...@@ -42,7 +42,7 @@ struct psc_i2s_stream {
* @playback: Playback stream context data * @playback: Playback stream context data
* @capture: Capture stream context data * @capture: Capture stream context data
*/ */
struct psc_i2s { struct psc_dma {
char name[32]; char name[32];
struct mpc52xx_psc __iomem *psc_regs; struct mpc52xx_psc __iomem *psc_regs;
struct mpc52xx_psc_fifo __iomem *fifo_regs; struct mpc52xx_psc_fifo __iomem *fifo_regs;
...@@ -53,8 +53,8 @@ struct psc_i2s { ...@@ -53,8 +53,8 @@ struct psc_i2s {
u32 sicr; u32 sicr;
/* per-stream data */ /* per-stream data */
struct psc_i2s_stream playback; struct psc_dma_stream playback;
struct psc_i2s_stream capture; struct psc_dma_stream capture;
/* Statistics */ /* Statistics */
struct { struct {
...@@ -64,18 +64,18 @@ struct psc_i2s { ...@@ -64,18 +64,18 @@ struct psc_i2s {
}; };
int psc_i2s_startup(struct snd_pcm_substream *substream, int psc_dma_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
int psc_i2s_hw_free(struct snd_pcm_substream *substream, int psc_dma_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
void psc_i2s_shutdown(struct snd_pcm_substream *substream, void psc_dma_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
extern struct snd_soc_platform psc_i2s_pcm_soc_platform; extern struct snd_soc_platform psc_dma_pcm_soc_platform;
#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
This diff is collapsed.
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