tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ALSA] ad1816a - Add clockfreq module option

Documentation,AD1816A driver
Added clockfreq module option for the card with a different clock frequency
than 33kHz.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Takashi Iwai and committed by
Jaroslav Kysela 5b8f7f73 5549d549

+16 -4
+1
include/sound/ad1816a.h
··· 138 138 spinlock_t lock; 139 139 140 140 unsigned short mode; 141 + unsigned int clock_freq; 141 142 142 143 snd_card_t *card; 143 144 snd_pcm_t *pcm;
+5
sound/isa/ad1816a/ad1816a.c
··· 53 53 static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */ 54 54 static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */ 55 55 static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */ 56 + static int clockfreq[SNDRV_CARDS]; 56 57 57 58 module_param_array(index, int, NULL, 0444); 58 59 MODULE_PARM_DESC(index, "Index value for ad1816a based soundcard."); ··· 75 74 MODULE_PARM_DESC(dma1, "1st DMA # for ad1816a driver."); 76 75 module_param_array(dma2, int, NULL, 0444); 77 76 MODULE_PARM_DESC(dma2, "2nd DMA # for ad1816a driver."); 77 + module_param_array(clockfreq, int, NULL, 0444); 78 + MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0)."); 78 79 79 80 struct snd_card_ad1816a { 80 81 struct pnp_dev *dev; ··· 212 209 snd_card_free(card); 213 210 return error; 214 211 } 212 + if (clockfreq[dev] >= 5000 && clockfreq[dev] <= 100000) 213 + chip->clock_freq = clockfreq[dev]; 215 214 216 215 strcpy(card->driver, "AD1816A"); 217 216 strcpy(card->shortname, "ADI SoundPort AD1816A");
+10 -4
sound/isa/ad1816a/ad1816a_lib.c
··· 234 234 ad1816a_t *chip = snd_pcm_substream_chip(substream); 235 235 unsigned long flags; 236 236 snd_pcm_runtime_t *runtime = substream->runtime; 237 - unsigned int size; 237 + unsigned int size, rate; 238 238 239 239 spin_lock_irqsave(&chip->lock, flags); 240 240 ··· 245 245 snd_dma_program(chip->dma1, runtime->dma_addr, size, 246 246 DMA_MODE_WRITE | DMA_AUTOINIT); 247 247 248 - snd_ad1816a_write(chip, AD1816A_PLAYBACK_SAMPLE_RATE, runtime->rate); 248 + rate = runtime->rate; 249 + if (chip->clock_freq) 250 + rate = (rate * 33000) / chip->clock_freq; 251 + snd_ad1816a_write(chip, AD1816A_PLAYBACK_SAMPLE_RATE, rate); 249 252 snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG, 250 253 AD1816A_FMT_ALL | AD1816A_FMT_STEREO, 251 254 snd_ad1816a_get_format(chip, runtime->format, ··· 266 263 ad1816a_t *chip = snd_pcm_substream_chip(substream); 267 264 unsigned long flags; 268 265 snd_pcm_runtime_t *runtime = substream->runtime; 269 - unsigned int size; 266 + unsigned int size, rate; 270 267 271 268 spin_lock_irqsave(&chip->lock, flags); 272 269 ··· 277 274 snd_dma_program(chip->dma2, runtime->dma_addr, size, 278 275 DMA_MODE_READ | DMA_AUTOINIT); 279 276 280 - snd_ad1816a_write(chip, AD1816A_CAPTURE_SAMPLE_RATE, runtime->rate); 277 + rate = runtime->rate; 278 + if (chip->clock_freq) 279 + rate = (rate * 33000) / chip->clock_freq; 280 + snd_ad1816a_write(chip, AD1816A_CAPTURE_SAMPLE_RATE, rate); 281 281 snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG, 282 282 AD1816A_FMT_ALL | AD1816A_FMT_STEREO, 283 283 snd_ad1816a_get_format(chip, runtime->format,