diff options
author | Jon Smirl <jonsmirl@gmail.com> | 2009-05-23 19:13:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-24 14:31:03 -0400 |
commit | cebe77674cab51a9ff1deaa077ab74aff3996764 (patch) | |
tree | 5f64370d795ffc835b39db88dfe67bdcf6de2de0 /sound/soc/fsl/mpc5200_dma.h | |
parent | 89dd08425273773fd33fc85d48d152c5679b2fb4 (diff) |
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: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.h')
-rw-r--r-- | sound/soc/fsl/mpc5200_dma.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h index 9a19e8a70c5f..a33232c0c59e 100644 --- a/sound/soc/fsl/mpc5200_dma.h +++ b/sound/soc/fsl/mpc5200_dma.h | |||
@@ -6,9 +6,9 @@ | |||
6 | #define __SOUND_SOC_FSL_MPC5200_DMA_H__ | 6 | #define __SOUND_SOC_FSL_MPC5200_DMA_H__ |
7 | 7 | ||
8 | /** | 8 | /** |
9 | * psc_i2s_stream - Data specific to a single stream (playback or capture) | 9 | * psc_dma_stream - Data specific to a single stream (playback or capture) |
10 | * @active: flag indicating if the stream is active | 10 | * @active: flag indicating if the stream is active |
11 | * @psc_i2s: pointer back to parent psc_i2s data structure | 11 | * @psc_dma: pointer back to parent psc_dma data structure |
12 | * @bcom_task: bestcomm task structure | 12 | * @bcom_task: bestcomm task structure |
13 | * @irq: irq number for bestcomm task | 13 | * @irq: irq number for bestcomm task |
14 | * @period_start: physical address of start of DMA region | 14 | * @period_start: physical address of start of DMA region |
@@ -16,9 +16,9 @@ | |||
16 | * @period_next_pt: physical address of next DMA buffer to enqueue | 16 | * @period_next_pt: physical address of next DMA buffer to enqueue |
17 | * @period_bytes: size of DMA period in bytes | 17 | * @period_bytes: size of DMA period in bytes |
18 | */ | 18 | */ |
19 | struct psc_i2s_stream { | 19 | struct psc_dma_stream { |
20 | int active; | 20 | int active; |
21 | struct psc_i2s *psc_i2s; | 21 | struct psc_dma *psc_dma; |
22 | struct bcom_task *bcom_task; | 22 | struct bcom_task *bcom_task; |
23 | int irq; | 23 | int irq; |
24 | struct snd_pcm_substream *stream; | 24 | struct snd_pcm_substream *stream; |
@@ -30,7 +30,7 @@ struct psc_i2s_stream { | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * psc_i2s - Private driver data | 33 | * psc_dma - Private driver data |
34 | * @name: short name for this device ("PSC0", "PSC1", etc) | 34 | * @name: short name for this device ("PSC0", "PSC1", etc) |
35 | * @psc_regs: pointer to the PSC's registers | 35 | * @psc_regs: pointer to the PSC's registers |
36 | * @fifo_regs: pointer to the PSC's FIFO registers | 36 | * @fifo_regs: pointer to the PSC's FIFO registers |
@@ -42,7 +42,7 @@ struct psc_i2s_stream { | |||
42 | * @playback: Playback stream context data | 42 | * @playback: Playback stream context data |
43 | * @capture: Capture stream context data | 43 | * @capture: Capture stream context data |
44 | */ | 44 | */ |
45 | struct psc_i2s { | 45 | struct psc_dma { |
46 | char name[32]; | 46 | char name[32]; |
47 | struct mpc52xx_psc __iomem *psc_regs; | 47 | struct mpc52xx_psc __iomem *psc_regs; |
48 | struct mpc52xx_psc_fifo __iomem *fifo_regs; | 48 | struct mpc52xx_psc_fifo __iomem *fifo_regs; |
@@ -53,8 +53,8 @@ struct psc_i2s { | |||
53 | u32 sicr; | 53 | u32 sicr; |
54 | 54 | ||
55 | /* per-stream data */ | 55 | /* per-stream data */ |
56 | struct psc_i2s_stream playback; | 56 | struct psc_dma_stream playback; |
57 | struct psc_i2s_stream capture; | 57 | struct psc_dma_stream capture; |
58 | 58 | ||
59 | /* Statistics */ | 59 | /* Statistics */ |
60 | struct { | 60 | struct { |
@@ -64,18 +64,18 @@ struct psc_i2s { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | 66 | ||
67 | int psc_i2s_startup(struct snd_pcm_substream *substream, | 67 | int psc_dma_startup(struct snd_pcm_substream *substream, |
68 | struct snd_soc_dai *dai); | 68 | struct snd_soc_dai *dai); |
69 | 69 | ||
70 | int psc_i2s_hw_free(struct snd_pcm_substream *substream, | 70 | int psc_dma_hw_free(struct snd_pcm_substream *substream, |
71 | struct snd_soc_dai *dai); | 71 | struct snd_soc_dai *dai); |
72 | 72 | ||
73 | void psc_i2s_shutdown(struct snd_pcm_substream *substream, | 73 | void psc_dma_shutdown(struct snd_pcm_substream *substream, |
74 | struct snd_soc_dai *dai); | 74 | struct snd_soc_dai *dai); |
75 | 75 | ||
76 | int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, | 76 | int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd, |
77 | struct snd_soc_dai *dai); | 77 | struct snd_soc_dai *dai); |
78 | 78 | ||
79 | extern struct snd_soc_platform psc_i2s_pcm_soc_platform; | 79 | extern struct snd_soc_platform psc_dma_pcm_soc_platform; |
80 | 80 | ||
81 | #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ | 81 | #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */ |