diff options
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r-- | sound/ppc/pmac.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index af76ee862d27..9b4e9c316695 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -299,7 +299,7 @@ static int snd_pmac_pcm_trigger(struct snd_pmac *chip, struct pmac_stream *rec, | |||
299 | case SNDRV_PCM_TRIGGER_SUSPEND: | 299 | case SNDRV_PCM_TRIGGER_SUSPEND: |
300 | spin_lock(&chip->reg_lock); | 300 | spin_lock(&chip->reg_lock); |
301 | rec->running = 0; | 301 | rec->running = 0; |
302 | /*printk("stopped!!\n");*/ | 302 | /*printk(KERN_DEBUG "stopped!!\n");*/ |
303 | snd_pmac_dma_stop(rec); | 303 | snd_pmac_dma_stop(rec); |
304 | for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) | 304 | for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++) |
305 | out_le16(&cp->command, DBDMA_STOP); | 305 | out_le16(&cp->command, DBDMA_STOP); |
@@ -334,7 +334,7 @@ static snd_pcm_uframes_t snd_pmac_pcm_pointer(struct snd_pmac *chip, | |||
334 | } | 334 | } |
335 | #endif | 335 | #endif |
336 | count += rec->cur_period * rec->period_size; | 336 | count += rec->cur_period * rec->period_size; |
337 | /*printk("pointer=%d\n", count);*/ | 337 | /*printk(KERN_DEBUG "pointer=%d\n", count);*/ |
338 | return bytes_to_frames(subs->runtime, count); | 338 | return bytes_to_frames(subs->runtime, count); |
339 | } | 339 | } |
340 | 340 | ||
@@ -486,7 +486,7 @@ static void snd_pmac_pcm_update(struct snd_pmac *chip, struct pmac_stream *rec) | |||
486 | if (! (stat & ACTIVE)) | 486 | if (! (stat & ACTIVE)) |
487 | break; | 487 | break; |
488 | 488 | ||
489 | /*printk("update frag %d\n", rec->cur_period);*/ | 489 | /*printk(KERN_DEBUG "update frag %d\n", rec->cur_period);*/ |
490 | st_le16(&cp->xfer_status, 0); | 490 | st_le16(&cp->xfer_status, 0); |
491 | st_le16(&cp->req_count, rec->period_size); | 491 | st_le16(&cp->req_count, rec->period_size); |
492 | /*st_le16(&cp->res_count, 0);*/ | 492 | /*st_le16(&cp->res_count, 0);*/ |
@@ -806,7 +806,7 @@ snd_pmac_ctrl_intr(int irq, void *devid) | |||
806 | struct snd_pmac *chip = devid; | 806 | struct snd_pmac *chip = devid; |
807 | int ctrl = in_le32(&chip->awacs->control); | 807 | int ctrl = in_le32(&chip->awacs->control); |
808 | 808 | ||
809 | /*printk("pmac: control interrupt.. 0x%x\n", ctrl);*/ | 809 | /*printk(KERN_DEBUG "pmac: control interrupt.. 0x%x\n", ctrl);*/ |
810 | if (ctrl & MASK_PORTCHG) { | 810 | if (ctrl & MASK_PORTCHG) { |
811 | /* do something when headphone is plugged/unplugged? */ | 811 | /* do something when headphone is plugged/unplugged? */ |
812 | if (chip->update_automute) | 812 | if (chip->update_automute) |
@@ -1033,7 +1033,8 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) | |||
1033 | } | 1033 | } |
1034 | if (of_device_is_compatible(sound, "tumbler")) { | 1034 | if (of_device_is_compatible(sound, "tumbler")) { |
1035 | chip->model = PMAC_TUMBLER; | 1035 | chip->model = PMAC_TUMBLER; |
1036 | chip->can_capture = machine_is_compatible("PowerMac4,2"); | 1036 | chip->can_capture = machine_is_compatible("PowerMac4,2") |
1037 | || machine_is_compatible("PowerBook4,1"); | ||
1037 | chip->can_duplex = 0; | 1038 | chip->can_duplex = 0; |
1038 | // chip->can_byte_swap = 0; /* FIXME: check this */ | 1039 | // chip->can_byte_swap = 0; /* FIXME: check this */ |
1039 | chip->num_freqs = ARRAY_SIZE(tumbler_freqs); | 1040 | chip->num_freqs = ARRAY_SIZE(tumbler_freqs); |