aboutsummaryrefslogtreecommitdiff
path: root/sound/mips/au1x00.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/mips/au1x00.c')
-rw-r--r--sound/mips/au1x00.c580
1 files changed, 311 insertions, 269 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index c20522b0213..fbcaa5434fd 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -36,13 +36,14 @@
#include <linux/ioport.h>
#include <linux/interrupt.h>
-#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <linux/version.h>
+#include <linux/module.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/pcm.h>
+#include <sound/pcm_params.h>
#include <sound/ac97_codec.h>
#include <asm/mach-au1x00/au1000.h>
#include <asm/mach-au1x00/au1000_dma.h>
@@ -50,14 +51,7 @@
MODULE_AUTHOR("Charles Eidsness <charles@cooper-street.com>");
MODULE_DESCRIPTION("Au1000 AC'97 ALSA Driver");
MODULE_LICENSE("GPL");
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
MODULE_SUPPORTED_DEVICE("{{AMD,Au1000 AC'97}}");
-#else
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
-#endif
-
-#define chip_t au1000_t
#define PLAYBACK 0
#define CAPTURE 1
@@ -70,18 +64,14 @@ MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
#define READ_WAIT 2
#define RW_DONE 3
-DECLARE_WAIT_QUEUE_HEAD(ac97_command_wq);
-
-typedef struct au1000_period au1000_period_t;
struct au1000_period
{
u32 start;
u32 relative_end; /*realtive to start of buffer*/
- au1000_period_t * next;
+ struct au1000_period * next;
};
/*Au1000 AC97 Port Control Reisters*/
-typedef struct au1000_ac97_reg au1000_ac97_reg_t;
struct au1000_ac97_reg {
u32 volatile config;
u32 volatile status;
@@ -90,32 +80,31 @@ struct au1000_ac97_reg {
u32 volatile cntrl;
};
-typedef struct audio_stream audio_stream_t;
struct audio_stream {
- snd_pcm_substream_t * substream;
+ struct snd_pcm_substream *substream;
int dma;
spinlock_t dma_lock;
- au1000_period_t * buffer;
- unsigned long period_size;
+ struct au1000_period * buffer;
+ unsigned int period_size;
+ unsigned int periods;
};
-typedef struct snd_card_au1000 {
- snd_card_t *card;
- au1000_ac97_reg_t volatile *ac97_ioport;
+struct snd_au1000 {
+ struct snd_card *card;
+ struct au1000_ac97_reg volatile *ac97_ioport;
struct resource *ac97_res_port;
spinlock_t ac97_lock;
- ac97_t *ac97;
+ struct snd_ac97 *ac97;
- snd_pcm_t *pcm;
- audio_stream_t *stream[2]; /* playback & capture */
-} au1000_t;
-
-static au1000_t *au1000 = NULL;
+ struct snd_pcm *pcm;
+ struct audio_stream *stream[2]; /* playback & capture */
+ int dmaid[2]; /* tx(0)/rx(1) DMA ids */
+};
/*--------------------------- Local Functions --------------------------------*/
static void
-au1000_set_ac97_xmit_slots(long xmit_slots)
+au1000_set_ac97_xmit_slots(struct snd_au1000 *au1000, long xmit_slots)
{
u32 volatile ac97_config;
@@ -128,7 +117,7 @@ au1000_set_ac97_xmit_slots(long xmit_slots)
}
static void
-au1000_set_ac97_recv_slots(long recv_slots)
+au1000_set_ac97_recv_slots(struct snd_au1000 *au1000, long recv_slots)
{
u32 volatile ac97_config;
@@ -142,86 +131,102 @@ au1000_set_ac97_recv_slots(long recv_slots)
static void
-au1000_dma_stop(audio_stream_t *stream)
+au1000_release_dma_link(struct audio_stream *stream)
+{
+ struct au1000_period * pointer;
+ struct au1000_period * pointer_next;
+
+ stream->period_size = 0;
+ stream->periods = 0;
+ pointer = stream->buffer;
+ if (! pointer)
+ return;
+ do {
+ pointer_next = pointer->next;
+ kfree(pointer);
+ pointer = pointer_next;
+ } while (pointer != stream->buffer);
+ stream->buffer = NULL;
+}
+
+static int
+au1000_setup_dma_link(struct audio_stream *stream, unsigned int period_bytes,
+ unsigned int periods)
{
- unsigned long flags;
- au1000_period_t * pointer;
- au1000_period_t * pointer_next;
+ struct snd_pcm_substream *substream = stream->substream;
+ struct snd_pcm_runtime *runtime = substream->runtime;
+ struct au1000_period *pointer;
+ unsigned long dma_start;
+ int i;
+
+ dma_start = virt_to_phys(runtime->dma_area);
- if (stream->buffer != NULL) {
- spin_lock_irqsave(&stream->dma_lock, flags);
- disable_dma(stream->dma);
- spin_unlock_irqrestore(&stream->dma_lock, flags);
+ if (stream->period_size == period_bytes &&
+ stream->periods == periods)
+ return 0; /* not changed */
- pointer = stream->buffer;
- pointer_next = stream->buffer->next;
+ au1000_release_dma_link(stream);
- do {
- kfree(pointer);
- pointer = pointer_next;
- pointer_next = pointer->next;
- } while (pointer != stream->buffer);
+ stream->period_size = period_bytes;
+ stream->periods = periods;
- stream->buffer = NULL;
+ stream->buffer = kmalloc(sizeof(struct au1000_period), GFP_KERNEL);
+ if (! stream->buffer)
+ return -ENOMEM;
+ pointer = stream->buffer;
+ for (i = 0; i < periods; i++) {
+ pointer->start = (u32)(dma_start + (i * period_bytes));
+ pointer->relative_end = (u32) (((i+1) * period_bytes) - 0x1);
+ if (i < periods - 1) {
+ pointer->next = kmalloc(sizeof(struct au1000_period), GFP_KERNEL);
+ if (! pointer->next) {
+ au1000_release_dma_link(stream);
+ return -ENOMEM;
+ }
+ pointer = pointer->next;
+ }
}
+ pointer->next = stream->buffer;
+ return 0;
}
static void
-au1000_dma_start(audio_stream_t *stream)
+au1000_dma_stop(struct audio_stream *stream)
{
- snd_pcm_substream_t *substream = stream->substream;
- snd_pcm_runtime_t *runtime = substream->runtime;
+ if (snd_BUG_ON(!stream->buffer))
+ return;
+ disable_dma(stream->dma);
+}
- unsigned long flags, dma_start;
- int i;
- au1000_period_t * pointer;
-
- if (stream->buffer == NULL) {
- dma_start = virt_to_phys(runtime->dma_area);
-
- stream->period_size = frames_to_bytes(runtime,
- runtime->period_size);
- stream->buffer = kmalloc(sizeof(au1000_period_t), GFP_KERNEL);
- pointer = stream->buffer;
- for (i = 0 ; i < runtime->periods ; i++) {
- pointer->start = (u32)(dma_start +
- (i * stream->period_size));
- pointer->relative_end = (u32)
- (((i+1) * stream->period_size) - 0x1);
- if ( i < runtime->periods - 1) {
- pointer->next = kmalloc(sizeof(au1000_period_t)
- , GFP_KERNEL);
- pointer = pointer->next;
- }
- }
- pointer->next = stream->buffer;
-
- spin_lock_irqsave(&stream->dma_lock, flags);
- init_dma(stream->dma);
- if (get_dma_active_buffer(stream->dma) == 0) {
- clear_dma_done0(stream->dma);
- set_dma_addr0(stream->dma, stream->buffer->start);
- set_dma_count0(stream->dma, stream->period_size >> 1);
- set_dma_addr1(stream->dma, stream->buffer->next->start);
- set_dma_count1(stream->dma, stream->period_size >> 1);
- } else {
- clear_dma_done1(stream->dma);
- set_dma_addr1(stream->dma, stream->buffer->start);
- set_dma_count1(stream->dma, stream->period_size >> 1);
- set_dma_addr0(stream->dma, stream->buffer->next->start);
- set_dma_count0(stream->dma, stream->period_size >> 1);
- }
- enable_dma_buffers(stream->dma);
- start_dma(stream->dma);
- spin_unlock_irqrestore(&stream->dma_lock, flags);
+static void
+au1000_dma_start(struct audio_stream *stream)
+{
+ if (snd_BUG_ON(!stream->buffer))
+ return;
+
+ init_dma(stream->dma);
+ if (get_dma_active_buffer(stream->dma) == 0) {
+ clear_dma_done0(stream->dma);
+ set_dma_addr0(stream->dma, stream->buffer->start);
+ set_dma_count0(stream->dma, stream->period_size >> 1);
+ set_dma_addr1(stream->dma, stream->buffer->next->start);
+ set_dma_count1(stream->dma, stream->period_size >> 1);
+ } else {
+ clear_dma_done1(stream->dma);
+ set_dma_addr1(stream->dma, stream->buffer->start);
+ set_dma_count1(stream->dma, stream->period_size >> 1);
+ set_dma_addr0(stream->dma, stream->buffer->next->start);
+ set_dma_count0(stream->dma, stream->period_size >> 1);
}
+ enable_dma_buffers(stream->dma);
+ start_dma(stream->dma);
}
static irqreturn_t
-au1000_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+au1000_dma_interrupt(int irq, void *dev_id)
{
- audio_stream_t *stream = (audio_stream_t *) dev_id;
- snd_pcm_substream_t *substream = stream->substream;
+ struct audio_stream *stream = (struct audio_stream *) dev_id;
+ struct snd_pcm_substream *substream = stream->substream;
spin_lock(&stream->dma_lock);
switch (get_dma_buffer_done(stream->dma)) {
@@ -240,11 +245,9 @@ au1000_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
enable_dma_buffer1(stream->dma);
break;
case (DMA_D0 | DMA_D1):
- spin_unlock(&stream->dma_lock);
printk(KERN_ERR "DMA %d missed interrupt.\n",stream->dma);
au1000_dma_stop(stream);
au1000_dma_start(stream);
- spin_lock(&stream->dma_lock);
break;
case (~DMA_D0 & ~DMA_D1):
printk(KERN_ERR "DMA %d empty irq.\n",stream->dma);
@@ -257,13 +260,13 @@ au1000_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/*-------------------------- PCM Audio Streams -------------------------------*/
static unsigned int rates[] = {8000, 11025, 16000, 22050};
-static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- .count = sizeof(rates) / sizeof(rates[0]),
+static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
+ .count = ARRAY_SIZE(rates),
.list = rates,
.mask = 0,
};
-static snd_pcm_hardware_t snd_au1000 =
+static struct snd_pcm_hardware snd_au1000_hw =
{
.info = (SNDRV_PCM_INFO_INTERLEAVED | \
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
@@ -283,88 +286,108 @@ static snd_pcm_hardware_t snd_au1000 =
};
static int
-snd_au1000_playback_open(snd_pcm_substream_t * substream)
+snd_au1000_playback_open(struct snd_pcm_substream *substream)
{
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+
au1000->stream[PLAYBACK]->substream = substream;
au1000->stream[PLAYBACK]->buffer = NULL;
substream->private_data = au1000->stream[PLAYBACK];
- substream->runtime->hw = snd_au1000;
+ substream->runtime->hw = snd_au1000_hw;
return (snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates) < 0);
}
static int
-snd_au1000_capture_open(snd_pcm_substream_t * substream)
+snd_au1000_capture_open(struct snd_pcm_substream *substream)
{
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+
au1000->stream[CAPTURE]->substream = substream;
au1000->stream[CAPTURE]->buffer = NULL;
substream->private_data = au1000->stream[CAPTURE];
- substream->runtime->hw = snd_au1000;
+ substream->runtime->hw = snd_au1000_hw;
return (snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates) < 0);
-
}
static int
-snd_au1000_playback_close(snd_pcm_substream_t * substream)
+snd_au1000_playback_close(struct snd_pcm_substream *substream)
{
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+
au1000->stream[PLAYBACK]->substream = NULL;
return 0;
}
static int
-snd_au1000_capture_close(snd_pcm_substream_t * substream)
+snd_au1000_capture_close(struct snd_pcm_substream *substream)
{
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+
au1000->stream[CAPTURE]->substream = NULL;
return 0;
}
static int
-snd_au1000_hw_params(snd_pcm_substream_t * substream,
- snd_pcm_hw_params_t * hw_params)
+snd_au1000_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *hw_params)
{
- return snd_pcm_lib_malloc_pages(substream,
- params_buffer_bytes(hw_params));
+ struct audio_stream *stream = substream->private_data;
+ int err;
+
+ err = snd_pcm_lib_malloc_pages(substream,
+ params_buffer_bytes(hw_params));
+ if (err < 0)
+ return err;
+ return au1000_setup_dma_link(stream,
+ params_period_bytes(hw_params),
+ params_periods(hw_params));
}
static int
-snd_au1000_hw_free(snd_pcm_substream_t * substream)
+snd_au1000_hw_free(struct snd_pcm_substream *substream)
{
+ struct audio_stream *stream = substream->private_data;
+ au1000_release_dma_link(stream);
return snd_pcm_lib_free_pages(substream);
}
static int
-snd_au1000_playback_prepare(snd_pcm_substream_t * substream)
+snd_au1000_playback_prepare(struct snd_pcm_substream *substream)
{
- snd_pcm_runtime_t *runtime = substream->runtime;
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+ struct snd_pcm_runtime *runtime = substream->runtime;
- if (runtime->channels == 1 )
- au1000_set_ac97_xmit_slots(AC97_SLOT_4);
+ if (runtime->channels == 1)
+ au1000_set_ac97_xmit_slots(au1000, AC97_SLOT_4);
else
- au1000_set_ac97_xmit_slots(AC97_SLOT_3 | AC97_SLOT_4);
+ au1000_set_ac97_xmit_slots(au1000, AC97_SLOT_3 | AC97_SLOT_4);
snd_ac97_set_rate(au1000->ac97, AC97_PCM_FRONT_DAC_RATE, runtime->rate);
return 0;
}
static int
-snd_au1000_capture_prepare(snd_pcm_substream_t * substream)
+snd_au1000_capture_prepare(struct snd_pcm_substream *substream)
{
- snd_pcm_runtime_t *runtime = substream->runtime;
+ struct snd_au1000 *au1000 = substream->pcm->private_data;
+ struct snd_pcm_runtime *runtime = substream->runtime;
- if (runtime->channels == 1 )
- au1000_set_ac97_recv_slots(AC97_SLOT_4);
+ if (runtime->channels == 1)
+ au1000_set_ac97_recv_slots(au1000, AC97_SLOT_4);
else
- au1000_set_ac97_recv_slots(AC97_SLOT_3 | AC97_SLOT_4);
+ au1000_set_ac97_recv_slots(au1000, AC97_SLOT_3 | AC97_SLOT_4);
snd_ac97_set_rate(au1000->ac97, AC97_PCM_LR_ADC_RATE, runtime->rate);
return 0;
}
static int
-snd_au1000_trigger(snd_pcm_substream_t * substream, int cmd)
+snd_au1000_trigger(struct snd_pcm_substream *substream, int cmd)
{
- audio_stream_t *stream = substream->private_data;
+ struct audio_stream *stream = substream->private_data;
int err = 0;
+ spin_lock(&stream->dma_lock);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
au1000_dma_start(stream);
@@ -376,27 +399,27 @@ snd_au1000_trigger(snd_pcm_substream_t * substream, int cmd)
err = -EINVAL;
break;
}
+ spin_unlock(&stream->dma_lock);
return err;
}
static snd_pcm_uframes_t
-snd_au1000_pointer(snd_pcm_substream_t * substream)
+snd_au1000_pointer(struct snd_pcm_substream *substream)
{
- audio_stream_t *stream = substream->private_data;
- snd_pcm_runtime_t *runtime = substream->runtime;
- unsigned long flags;
+ struct audio_stream *stream = substream->private_data;
+ struct snd_pcm_runtime *runtime = substream->runtime;
long location;
- spin_lock_irqsave(&stream->dma_lock, flags);
+ spin_lock(&stream->dma_lock);
location = get_dma_residue(stream->dma);
- spin_unlock_irqrestore(&stream->dma_lock, flags);
+ spin_unlock(&stream->dma_lock);
location = stream->buffer->relative_end - location;
if (location == -1)
location = 0;
return bytes_to_frames(runtime,location);
}
-static snd_pcm_ops_t snd_card_au1000_playback_ops = {
+static struct snd_pcm_ops snd_card_au1000_playback_ops = {
.open = snd_au1000_playback_open,
.close = snd_au1000_playback_close,
.ioctl = snd_pcm_lib_ioctl,
@@ -407,7 +430,7 @@ static snd_pcm_ops_t snd_card_au1000_playback_ops = {
.pointer = snd_au1000_pointer,
};
-static snd_pcm_ops_t snd_card_au1000_capture_ops = {
+static struct snd_pcm_ops snd_card_au1000_capture_ops = {
.open = snd_au1000_capture_open,
.close = snd_au1000_capture_close,
.ioctl = snd_pcm_lib_ioctl,
@@ -418,10 +441,10 @@ static snd_pcm_ops_t snd_card_au1000_capture_ops = {
.pointer = snd_au1000_pointer,
};
-static int __devinit
-snd_au1000_pcm_new(void)
+static int
+snd_au1000_pcm_new(struct snd_au1000 *au1000)
{
- snd_pcm_t *pcm;
+ struct snd_pcm *pcm;
int err;
unsigned long flags;
@@ -440,16 +463,21 @@ snd_au1000_pcm_new(void)
pcm->info_flags = 0;
strcpy(pcm->name, "Au1000 AC97 PCM");
+ spin_lock_init(&au1000->stream[PLAYBACK]->dma_lock);
+ spin_lock_init(&au1000->stream[CAPTURE]->dma_lock);
+
flags = claim_dma_lock();
- if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX,
- "AC97 TX", au1000_dma_interrupt, SA_INTERRUPT,
- au1000->stream[PLAYBACK])) < 0) {
+ au1000->stream[PLAYBACK]->dma = request_au1000_dma(au1000->dmaid[0],
+ "AC97 TX", au1000_dma_interrupt, 0,
+ au1000->stream[PLAYBACK]);
+ if (au1000->stream[PLAYBACK]->dma < 0) {
release_dma_lock(flags);
return -EBUSY;
}
- if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX,
- "AC97 RX", au1000_dma_interrupt, SA_INTERRUPT,
- au1000->stream[CAPTURE])) < 0){
+ au1000->stream[CAPTURE]->dma = request_au1000_dma(au1000->dmaid[1],
+ "AC97 RX", au1000_dma_interrupt, 0,
+ au1000->stream[CAPTURE]);
+ if (au1000->stream[CAPTURE]->dma < 0){
release_dma_lock(flags);
return -EBUSY;
}
@@ -459,8 +487,6 @@ snd_au1000_pcm_new(void)
set_dma_mode(au1000->stream[CAPTURE]->dma,
get_dma_mode(au1000->stream[CAPTURE]->dma) & ~DMA_NC);
release_dma_lock(flags);
- spin_lock_init(&au1000->stream[PLAYBACK]->dma_lock);
- spin_lock_init(&au1000->stream[CAPTURE]->dma_lock);
au1000->pcm = pcm;
return 0;
}
@@ -469,14 +495,16 @@ snd_au1000_pcm_new(void)
/*-------------------------- AC97 CODEC Control ------------------------------*/
static unsigned short
-snd_au1000_ac97_read(ac97_t *ac97, unsigned short reg)
+snd_au1000_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{
+ struct snd_au1000 *au1000 = ac97->private_data;
u32 volatile cmd;
u16 volatile data;
int i;
- spin_lock(au1000->ac97_lock);
-/* would rather use the interupt than this polling but it works and I can't
-get the interupt driven case to work efficiently */
+
+ spin_lock(&au1000->ac97_lock);
+/* would rather use the interrupt than this polling but it works and I can't
+get the interrupt driven case to work efficiently */
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;
@@ -493,11 +521,12 @@ get the interupt driven case to work efficiently */
break;
if (i == 0x5000) {
printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n");
+ spin_unlock(&au1000->ac97_lock);
return 0;
}
data = au1000->ac97_ioport->cmd & 0xffff;
- spin_unlock(au1000->ac97_lock);
+ spin_unlock(&au1000->ac97_lock);
return data;
@@ -505,13 +534,15 @@ get the interupt driven case to work efficiently */
static void
-snd_au1000_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
+snd_au1000_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
{
+ struct snd_au1000 *au1000 = ac97->private_data;
u32 cmd;
int i;
- spin_lock(au1000->ac97_lock);
-/* would rather use the interupt than this polling but it works and I can't
-get the interupt driven case to work efficiently */
+
+ spin_lock(&au1000->ac97_lock);
+/* would rather use the interrupt than this polling but it works and I can't
+get the interrupt driven case to work efficiently */
for (i = 0; i < 0x5000; i++)
if (!(au1000->ac97_ioport->status & AC97C_CP))
break;
@@ -522,41 +553,113 @@ get the interupt driven case to work efficiently */
cmd &= ~AC97C_READ;
cmd |= ((u32) val << AC97C_WD_BIT);
au1000->ac97_ioport->cmd = cmd;
- spin_unlock(au1000->ac97_lock);
+ spin_unlock(&au1000->ac97_lock);
}
-static void
-snd_au1000_ac97_free(ac97_t *ac97)
+
+/*------------------------------ Setup / Destroy ----------------------------*/
+
+static void snd_au1000_free(struct snd_card *card)
{
- au1000->ac97 = NULL;
+ struct snd_au1000 *au1000 = card->private_data;
+
+ if (au1000->stream[PLAYBACK]) {
+ if (au1000->stream[PLAYBACK]->dma >= 0)
+ free_au1000_dma(au1000->stream[PLAYBACK]->dma);
+ kfree(au1000->stream[PLAYBACK]);
+ }
+
+ if (au1000->stream[CAPTURE]) {
+ if (au1000->stream[CAPTURE]->dma >= 0)
+ free_au1000_dma(au1000->stream[CAPTURE]->dma);
+ kfree(au1000->stream[CAPTURE]);
+ }
+
+ if (au1000->ac97_res_port) {
+ /* put internal AC97 block into reset */
+ if (au1000->ac97_ioport) {
+ au1000->ac97_ioport->cntrl = AC97C_RS;
+ iounmap(au1000->ac97_ioport);
+ au1000->ac97_ioport = NULL;
+ }
+ release_and_free_resource(au1000->ac97_res_port);
+ au1000->ac97_res_port = NULL;
+ }
}
-static int __devinit
-snd_au1000_ac97_new(void)
+static struct snd_ac97_bus_ops ops = {
+ .write = snd_au1000_ac97_write,
+ .read = snd_au1000_ac97_read,
+};
+
+static int au1000_ac97_probe(struct platform_device *pdev)
{
int err;
+ void __iomem *io;
+ struct resource *r;
+ struct snd_card *card;
+ struct snd_au1000 *au1000;
+ struct snd_ac97_bus *pbus;
+ struct snd_ac97_template ac97;
+
+ err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE,
+ sizeof(struct snd_au1000), &card);
+ if (err < 0)
+ return err;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
- ac97_bus_t *pbus;
- ac97_template_t ac97;
- static ac97_bus_ops_t ops = {
- .write = snd_au1000_ac97_write,
- .read = snd_au1000_ac97_read,
- };
-#else
- ac97_bus_t bus, *pbus;
- ac97_t ac97;
-#endif
-
- if ((au1000->ac97_res_port = request_region(AC97C_CONFIG,
- sizeof(au1000_ac97_reg_t), "Au1x00 AC97")) == NULL) {
- snd_printk(KERN_ERR "ALSA AC97: can't grap AC97 port\n");
- return -EBUSY;
+ au1000 = card->private_data;
+ au1000->card = card;
+ spin_lock_init(&au1000->ac97_lock);
+
+ /* from here on let ALSA call the special freeing function */
+ card->private_free = snd_au1000_free;
+
+ /* TX DMA ID */
+ r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+ if (!r) {
+ err = -ENODEV;
+ snd_printk(KERN_INFO "no TX DMA platform resource!\n");
+ goto out;
+ }
+ au1000->dmaid[0] = r->start;
+
+ /* RX DMA ID */
+ r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+ if (!r) {
+ err = -ENODEV;
+ snd_printk(KERN_INFO "no RX DMA platform resource!\n");
+ goto out;
}
- au1000->ac97_ioport = (au1000_ac97_reg_t *) au1000->ac97_res_port->start;
+ au1000->dmaid[1] = r->start;
- spin_lock_init(&au1000->ac97_lock);
+ au1000->stream[PLAYBACK] = kmalloc(sizeof(struct audio_stream),
+ GFP_KERNEL);
+ if (!au1000->stream[PLAYBACK])
+ goto out;
+ au1000->stream[PLAYBACK]->dma = -1;
- spin_lock(&au1000->ac97_lock);
+ au1000->stream[CAPTURE] = kmalloc(sizeof(struct audio_stream),
+ GFP_KERNEL);
+ if (!au1000->stream[CAPTURE])
+ goto out;
+ au1000->stream[CAPTURE]->dma = -1;
+
+ r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!r)
+ goto out;
+
+ err = -EBUSY;
+ au1000->ac97_res_port = request_mem_region(r->start, resource_size(r),
+ pdev->name);
+ if (!au1000->ac97_res_port) {
+ snd_printk(KERN_ERR "ALSA AC97: can't grab AC97 port\n");
+ goto out;
+ }
+
+ io = ioremap(r->start, resource_size(r));
+ if (!io)
+ goto out;
+
+ au1000->ac97_ioport = (struct au1000_ac97_reg *)io;
/* configure pins for AC'97
TODO: move to board_setup.c */
@@ -574,113 +677,52 @@ snd_au1000_ac97_new(void)
au1000->ac97_ioport->config = 0x0;
mdelay(5);
- spin_unlock(&au1000->ac97_lock);
-
/* Initialise AC97 middle-layer */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
- if ((err = snd_ac97_bus(au1000->card, 0, &ops, au1000, &pbus)) < 0)
- return err;
-#else
- memset(&bus, 0, sizeof(bus));
- bus.write = snd_au1000_ac97_write;
- bus.read = snd_au1000_ac97_read;
- if ((err = snd_ac97_bus(au1000->card, &bus, &pbus)) < 0)
- return err;
-#endif
+ err = snd_ac97_bus(au1000->card, 0, &ops, au1000, &pbus);
+ if (err < 0)
+ goto out;
+
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = au1000;
- ac97.private_free = snd_au1000_ac97_free;
- if ((err = snd_ac97_mixer(pbus, &ac97, &au1000->ac97)) < 0)
- return err;
- return 0;
+ err = snd_ac97_mixer(pbus, &ac97, &au1000->ac97);
+ if (err < 0)
+ goto out;
-}
+ err = snd_au1000_pcm_new(au1000);
+ if (err < 0)
+ goto out;
-/*------------------------------ Setup / Destroy ----------------------------*/
+ strcpy(card->driver, "Au1000-AC97");
+ strcpy(card->shortname, "AMD Au1000-AC97");
+ sprintf(card->longname, "AMD Au1000--AC97 ALSA Driver");
-void
-snd_au1000_free(snd_card_t *card)
-{
+ err = snd_card_register(card);
+ if (err < 0)
+ goto out;
- if (au1000->ac97_res_port) {
- /* put internal AC97 block into reset */
- au1000->ac97_ioport->cntrl = AC97C_RS;
- au1000->ac97_ioport = NULL;
- release_resource(au1000->ac97_res_port);
- kfree_nocheck(au1000->ac97_res_port);
- }
-
- if (au1000->stream[PLAYBACK]->dma >= 0)
- free_au1000_dma(au1000->stream[PLAYBACK]->dma);
-
- if (au1000->stream[CAPTURE]->dma >= 0)
- free_au1000_dma(au1000->stream[CAPTURE]->dma);
-
- kfree(au1000->stream[PLAYBACK]);
- au1000->stream[PLAYBACK] = NULL;
- kfree(au1000->stream[CAPTURE]);
- au1000->stream[CAPTURE] = NULL;
- kfree(au1000);
- au1000 = NULL;
-
-}
-
-static int __init
-au1000_init(void)
-{
- int err;
+ printk(KERN_INFO "ALSA AC97: Driver Initialized\n");
- au1000 = kmalloc(sizeof(au1000_t), GFP_KERNEL);
- if (au1000 == NULL)
- return -ENOMEM;
- au1000->stream[PLAYBACK] = kmalloc(sizeof(audio_stream_t), GFP_KERNEL);
- if (au1000->stream[PLAYBACK] == NULL)
- return -ENOMEM;
- au1000->stream[CAPTURE] = kmalloc(sizeof(audio_stream_t), GFP_KERNEL);
- if (au1000->stream[CAPTURE] == NULL)
- return -ENOMEM;
- /* so that snd_au1000_free will work as intended */
- au1000->stream[PLAYBACK]->dma = -1;
- au1000->stream[CAPTURE]->dma = -1;
- au1000->ac97_res_port = NULL;
+ platform_set_drvdata(pdev, card);
- au1000->card = snd_card_new(-1, "AC97", THIS_MODULE, sizeof(au1000_t));
- if (au1000->card == NULL) {
- snd_au1000_free(au1000->card);
- return -ENOMEM;
- }
-
- au1000->card->private_data = (au1000_t *)au1000;
- au1000->card->private_free = snd_au1000_free;
-
- if ((err = snd_au1000_ac97_new()) < 0 ) {
- snd_card_free(au1000->card);
- return err;
- }
-
- if ((err = snd_au1000_pcm_new()) < 0) {
- snd_card_free(au1000->card);
- return err;
- }
-
- strcpy(au1000->card->driver, "AMD-Au1000-AC97");
- strcpy(au1000->card->shortname, "Au1000-AC97");
- sprintf(au1000->card->longname, "AMD Au1000--AC97 ALSA Driver");
-
- if ((err = snd_card_register(au1000->card)) < 0) {
- snd_card_free(au1000->card);
- return err;
- }
-
- printk( KERN_INFO "ALSA AC97: Driver Initialized\n" );
return 0;
+
+ out:
+ snd_card_free(card);
+ return err;
}
-static void __exit au1000_exit(void)
+static int au1000_ac97_remove(struct platform_device *pdev)
{
- snd_card_free(au1000->card);
+ return snd_card_free(platform_get_drvdata(pdev));
}
-module_init(au1000_init);
-module_exit(au1000_exit);
+struct platform_driver au1000_ac97c_driver = {
+ .driver = {
+ .name = "au1000-ac97c",
+ .owner = THIS_MODULE,
+ },
+ .probe = au1000_ac97_probe,
+ .remove = au1000_ac97_remove,
+};
+module_platform_driver(au1000_ac97c_driver);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-13 17:54:58 +0000