mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 06:02:05 +00:00
f487537c2b
Compiling in the MPC5200 sound drivers results in the following build error: sound/soc/fsl/mpc5200_psc_ac97.o: In function `to_psc_dma_stream': mpc5200_psc_ac97.c:(.text+0x0): multiple definition of `to_psc_dma_stream' sound/soc/fsl/mpc5200_dma.o:mpc5200_dma.c:(.text+0x0): first defined here sound/soc/fsl/efika-audio-fabric.o: In function `to_psc_dma_stream': efika-audio-fabric.c:(.text+0x0): multiple definition of `to_psc_dma_stream' sound/soc/fsl/mpc5200_dma.o:mpc5200_dma.c:(.text+0x0): first defined here make[3]: *** [sound/soc/fsl/built-in.o] Error 1 make[2]: *** [sound/soc/fsl] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 This patch fixes it by declaring the inline function in the header file to also be a static. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Jon Smirl <jonsmirl@gmail.com> Tested-by: John Hilmar Linkhorst <John.Linkhorst@rwth-aachen.de> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
90 lines
2.4 KiB
C
90 lines
2.4 KiB
C
/*
|
|
* Freescale MPC5200 Audio DMA driver
|
|
*/
|
|
|
|
#ifndef __SOUND_SOC_FSL_MPC5200_DMA_H__
|
|
#define __SOUND_SOC_FSL_MPC5200_DMA_H__
|
|
|
|
#define PSC_STREAM_NAME_LEN 32
|
|
|
|
/**
|
|
* psc_ac97_stream - Data specific to a single stream (playback or capture)
|
|
* @active: flag indicating if the stream is active
|
|
* @psc_dma: pointer back to parent psc_dma data structure
|
|
* @bcom_task: bestcomm task structure
|
|
* @irq: irq number for bestcomm task
|
|
* @period_end: physical address of end of DMA region
|
|
* @period_next_pt: physical address of next DMA buffer to enqueue
|
|
* @period_bytes: size of DMA period in bytes
|
|
* @ac97_slot_bits: Enable bits for turning on the correct AC97 slot
|
|
*/
|
|
struct psc_dma_stream {
|
|
struct snd_pcm_runtime *runtime;
|
|
int active;
|
|
struct psc_dma *psc_dma;
|
|
struct bcom_task *bcom_task;
|
|
int irq;
|
|
struct snd_pcm_substream *stream;
|
|
int period_next;
|
|
int period_current;
|
|
int period_bytes;
|
|
int period_count;
|
|
|
|
/* AC97 state */
|
|
u32 ac97_slot_bits;
|
|
};
|
|
|
|
/**
|
|
* psc_dma - Private driver data
|
|
* @name: short name for this device ("PSC0", "PSC1", etc)
|
|
* @psc_regs: pointer to the PSC's registers
|
|
* @fifo_regs: pointer to the PSC's FIFO registers
|
|
* @irq: IRQ of this PSC
|
|
* @dev: struct device pointer
|
|
* @dai: the CPU DAI for this device
|
|
* @sicr: Base value used in serial interface control register; mode is ORed
|
|
* with this value.
|
|
* @playback: Playback stream context data
|
|
* @capture: Capture stream context data
|
|
*/
|
|
struct psc_dma {
|
|
char name[32];
|
|
struct mpc52xx_psc __iomem *psc_regs;
|
|
struct mpc52xx_psc_fifo __iomem *fifo_regs;
|
|
unsigned int irq;
|
|
struct device *dev;
|
|
spinlock_t lock;
|
|
struct mutex mutex;
|
|
u32 sicr;
|
|
uint sysclk;
|
|
int imr;
|
|
int id;
|
|
unsigned int slots;
|
|
|
|
/* per-stream data */
|
|
struct psc_dma_stream playback;
|
|
struct psc_dma_stream capture;
|
|
|
|
/* Statistics */
|
|
struct {
|
|
unsigned long overrun_count;
|
|
unsigned long underrun_count;
|
|
} stats;
|
|
};
|
|
|
|
/* Utility for retrieving psc_dma_stream structure from a substream */
|
|
static inline struct psc_dma_stream *
|
|
to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
|
|
{
|
|
if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
|
|
return &psc_dma->capture;
|
|
return &psc_dma->playback;
|
|
}
|
|
|
|
int mpc5200_audio_dma_create(struct of_device *op);
|
|
int mpc5200_audio_dma_destroy(struct of_device *op);
|
|
|
|
extern struct snd_soc_platform mpc5200_audio_dma_platform;
|
|
|
|
#endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
|