Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7c5814c7199851c5fe9395d08fc1ab3c8c1531ea

Authored by Linus Torvalds
2 parents a042e26137 89e1e66d6b

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: usb-audio: automatically detect feedback format
  ASoC: sound/wm9090: add missing __devexit marker
  ASoC: sound/max98088: add missing __devexit marker
  ASoC: sound/ad73311: add missing __devexit marker
  ASoC: fsl - fix build error in pcm030-audio-fabric.c
  sound/oss/sb_ess.c: delete double assignment
  ALSA: hda - Change BTL amp level on some HP notebooks

Showing 10 changed files Side-by-side Diff

... ... @@ -1722,7 +1722,6 @@
1722 1722 right = (value & 0x0000ff00) >> 8;
1723 1723 } else { /* Turn it off (3) */
1724 1724 left = 0;
1725   - left = 0;
1726 1725 right = 0;
1727 1726 }
1728 1727 sb_common_mixer_set(devc, i + ES_REC_MIXER_RECDIFF, left, right);
sound/pci/hda/patch_sigmatel.c
Diff comments   View file @ 7c5814c
... ... @@ -5326,6 +5326,82 @@
5326 5326 return 0;
5327 5327 }
5328 5328  
  5329 +static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)
  5330 +{
  5331 + if (codec->vendor_id != 0x111d7605 &&
  5332 + codec->vendor_id != 0x111d76d1)
  5333 + return 0;
  5334 +
  5335 + switch (codec->subsystem_id) {
  5336 + case 0x103c1618:
  5337 + case 0x103c1619:
  5338 + case 0x103c161a:
  5339 + case 0x103c161b:
  5340 + case 0x103c161c:
  5341 + case 0x103c161d:
  5342 + case 0x103c161e:
  5343 + case 0x103c161f:
  5344 + case 0x103c1620:
  5345 + case 0x103c1621:
  5346 + case 0x103c1622:
  5347 + case 0x103c1623:
  5348 +
  5349 + case 0x103c162a:
  5350 + case 0x103c162b:
  5351 +
  5352 + case 0x103c1630:
  5353 + case 0x103c1631:
  5354 +
  5355 + case 0x103c1633:
  5356 +
  5357 + case 0x103c1635:
  5358 +
  5359 + case 0x103c164f:
  5360 +
  5361 + case 0x103c1676:
  5362 + case 0x103c1677:
  5363 + case 0x103c1678:
  5364 + case 0x103c1679:
  5365 + case 0x103c167a:
  5366 + case 0x103c167b:
  5367 + case 0x103c167c:
  5368 + case 0x103c167d:
  5369 + case 0x103c167e:
  5370 + case 0x103c167f:
  5371 + case 0x103c1680:
  5372 + case 0x103c1681:
  5373 + case 0x103c1682:
  5374 + case 0x103c1683:
  5375 + case 0x103c1684:
  5376 + case 0x103c1685:
  5377 + case 0x103c1686:
  5378 + case 0x103c1687:
  5379 + case 0x103c1688:
  5380 + case 0x103c1689:
  5381 + case 0x103c168a:
  5382 + case 0x103c168b:
  5383 + case 0x103c168c:
  5384 + case 0x103c168d:
  5385 + case 0x103c168e:
  5386 + case 0x103c168f:
  5387 + case 0x103c1690:
  5388 + case 0x103c1691:
  5389 + case 0x103c1692:
  5390 +
  5391 + case 0x103c3587:
  5392 + case 0x103c3588:
  5393 + case 0x103c3589:
  5394 + case 0x103c358a:
  5395 +
  5396 + case 0x103c3667:
  5397 + case 0x103c3668:
  5398 + /* set BTL amp level to 13.43dB for louder speaker output */
  5399 + return snd_hda_codec_write_cache(codec, codec->afg, 0,
  5400 + 0x7F4, 0x14);
  5401 + }
  5402 + return 0;
  5403 +}
  5404 +
5329 5405 static int patch_stac92hd83xxx(struct hda_codec *codec)
5330 5406 {
5331 5407 struct sigmatel_spec *spec;
... ... @@ -5451,6 +5527,8 @@
5451 5527 snd_hda_codec_write_cache(codec, 0xF, 0,
5452 5528 AC_VERB_SET_CONNECT_SEL, num_dacs);
5453 5529 }
  5530 +
  5531 + stac92hd83xxx_set_system_btl_amp(codec);
5454 5532  
5455 5533 codec->proc_widget_hook = stac92hd_proc_hook;
5456 5534  
sound/soc/codecs/ad73311.c
Diff comments   View file @ 7c5814c
... ... @@ -47,7 +47,7 @@
47 47 &soc_codec_dev_ad73311, &ad73311_dai, 1);
48 48 }
49 49  
50   -static int ad73311_remove(struct platform_device *pdev)
  50 +static int __devexit ad73311_remove(struct platform_device *pdev)
51 51 {
52 52 snd_soc_unregister_codec(&pdev->dev);
53 53 return 0;
sound/soc/codecs/max98088.c
Diff comments   View file @ 7c5814c
... ... @@ -2051,7 +2051,7 @@
2051 2051 return ret;
2052 2052 }
2053 2053  
2054   -static int max98088_i2c_remove(struct i2c_client *client)
  2054 +static int __devexit max98088_i2c_remove(struct i2c_client *client)
2055 2055 {
2056 2056 snd_soc_unregister_codec(&client->dev);
2057 2057 kfree(i2c_get_clientdata(client));
sound/soc/codecs/wm9090.c
Diff comments   View file @ 7c5814c
... ... @@ -665,7 +665,7 @@
665 665 return ret;
666 666 }
667 667  
668   -static int wm9090_i2c_remove(struct i2c_client *i2c)
  668 +static int __devexit wm9090_i2c_remove(struct i2c_client *i2c)
669 669 {
670 670 struct wm9090_priv *wm9090 = i2c_get_clientdata(i2c);
671 671  
sound/soc/fsl/pcm030-audio-fabric.c
Diff comments   View file @ 7c5814c
... ... @@ -24,7 +24,6 @@
24 24 #include <sound/pcm_params.h>
25 25 #include <sound/initval.h>
26 26 #include <sound/soc.h>
27   -#include <sound/soc-of-simple.h>
28 27  
29 28 #include "mpc5200_dma.h"
30 29 #include "mpc5200_psc_ac97.h"
... ... @@ -49,7 +48,7 @@
49 48 .codec_dai_name = "wm9712-aux",
50 49 .cpu_dai_name = "mpc5200-psc-ac97.1",
51 50 .platform_name = "mpc5200-pcm-audio",
52   - ..codec_name = "wm9712-codec",
  51 + .codec_name = "wm9712-codec",
53 52 },
54 53 };
55 54  
... ... @@ -62,12 +62,14 @@
62 62 unsigned int syncinterval; /* P for adaptive mode, 0 otherwise */
63 63 unsigned int freqn; /* nominal sampling rate in fs/fps in Q16.16 format */
64 64 unsigned int freqm; /* momentary sampling rate in fs/fps in Q16.16 format */
  65 + int freqshift; /* how much to shift the feedback value to get Q16.16 */
65 66 unsigned int freqmax; /* maximum sampling rate, used for buffer management */
66 67 unsigned int phase; /* phase accumulator */
67 68 unsigned int maxpacksize; /* max packet size in bytes */
68 69 unsigned int maxframesize; /* max packet size in frames */
69 70 unsigned int curpacksize; /* current packet size in bytes (for capture) */
70 71 unsigned int curframesize; /* current packet size in frames (for capture) */
  72 + unsigned int syncmaxsize; /* sync endpoint packet size */
71 73 unsigned int fill_max: 1; /* fill max packet size always */
72 74 unsigned int txfr_quirk:1; /* allow sub-frame alignment */
73 75 unsigned int fmt_type; /* USB audio format type (1-3) */
... ... @@ -237,6 +237,7 @@
237 237 subs->datainterval = fmt->datainterval;
238 238 subs->syncpipe = subs->syncinterval = 0;
239 239 subs->maxpacksize = fmt->maxpacksize;
  240 + subs->syncmaxsize = 0;
240 241 subs->fill_max = 0;
241 242  
242 243 /* we need a sync pipe in async OUT or adaptive IN mode */
... ... @@ -283,6 +284,7 @@
283 284 subs->syncinterval = get_endpoint(alts, 1)->bInterval - 1;
284 285 else
285 286 subs->syncinterval = 3;
  287 + subs->syncmaxsize = le16_to_cpu(get_endpoint(alts, 1)->wMaxPacketSize);
286 288 }
287 289  
288 290 /* always fill max packet size */
... ... @@ -132,6 +132,11 @@
132 132 ? get_full_speed_hz(subs->freqm)
133 133 : get_high_speed_hz(subs->freqm),
134 134 subs->freqm >> 16, subs->freqm & 0xffff);
  135 + if (subs->freqshift != INT_MIN)
  136 + snd_iprintf(buffer, " Feedback Format = %d.%d\n",
  137 + (subs->syncmaxsize > 3 ? 32 : 24)
  138 + - (16 - subs->freqshift),
  139 + 16 - subs->freqshift);
135 140 } else {
136 141 snd_iprintf(buffer, " Status: Stop\n");
137 142 }
... ... @@ -225,6 +225,7 @@
225 225 else
226 226 subs->freqn = get_usb_high_speed_rate(rate);
227 227 subs->freqm = subs->freqn;
  228 + subs->freqshift = INT_MIN;
228 229 /* calculate max. frequency */
229 230 if (subs->maxpacksize) {
230 231 /* whatever fits into a max. size packet */
231 232  
... ... @@ -513,11 +514,10 @@
513 514  
514 515  
515 516 /*
516   - * prepare urb for full speed playback sync pipe
  517 + * prepare urb for playback sync pipe
517 518 *
518 519 * set up the offset and length to receive the current frequency.
519 520 */
520   -
521 521 static int prepare_playback_sync_urb(struct snd_usb_substream *subs,
522 522 struct snd_pcm_runtime *runtime,
523 523 struct urb *urb)
524 524  
525 525  
526 526  
527 527  
528 528  
529 529  
530 530  
531 531  
532 532  
533 533  
... ... @@ -525,103 +525,78 @@
525 525 struct snd_urb_ctx *ctx = urb->context;
526 526  
527 527 urb->dev = ctx->subs->dev; /* we need to set this at each time */
528   - urb->iso_frame_desc[0].length = 3;
  528 + urb->iso_frame_desc[0].length = min(4u, ctx->subs->syncmaxsize);
529 529 urb->iso_frame_desc[0].offset = 0;
530 530 return 0;
531 531 }
532 532  
533 533 /*
534   - * prepare urb for high speed playback sync pipe
  534 + * process after playback sync complete
535 535 *
536   - * set up the offset and length to receive the current frequency.
  536 + * Full speed devices report feedback values in 10.14 format as samples per
  537 + * frame, high speed devices in 16.16 format as samples per microframe.
  538 + * Because the Audio Class 1 spec was written before USB 2.0, many high speed
  539 + * devices use a wrong interpretation, some others use an entirely different
  540 + * format. Therefore, we cannot predict what format any particular device uses
  541 + * and must detect it automatically.
537 542 */
538   -
539   -static int prepare_playback_sync_urb_hs(struct snd_usb_substream *subs,
540   - struct snd_pcm_runtime *runtime,
541   - struct urb *urb)
542   -{
543   - struct snd_urb_ctx *ctx = urb->context;
544   -
545   - urb->dev = ctx->subs->dev; /* we need to set this at each time */
546   - urb->iso_frame_desc[0].length = 4;
547   - urb->iso_frame_desc[0].offset = 0;
548   - return 0;
549   -}
550   -
551   -/*
552   - * process after full speed playback sync complete
553   - *
554   - * retrieve the current 10.14 frequency from pipe, and set it.
555   - * the value is referred in prepare_playback_urb().
556   - */
557 543 static int retire_playback_sync_urb(struct snd_usb_substream *subs,
558 544 struct snd_pcm_runtime *runtime,
559 545 struct urb *urb)
560 546 {
561 547 unsigned int f;
  548 + int shift;
562 549 unsigned long flags;
563 550  
564   - if (urb->iso_frame_desc[0].status == 0 &&
565   - urb->iso_frame_desc[0].actual_length == 3) {
566   - f = combine_triple((u8*)urb->transfer_buffer) << 2;
567   - if (f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax) {
568   - spin_lock_irqsave(&subs->lock, flags);
569   - subs->freqm = f;
570   - spin_unlock_irqrestore(&subs->lock, flags);
571   - }
572   - }
  551 + if (urb->iso_frame_desc[0].status != 0 ||
  552 + urb->iso_frame_desc[0].actual_length < 3)
  553 + return 0;
573 554  
574   - return 0;
575   -}
  555 + f = le32_to_cpup(urb->transfer_buffer);
  556 + if (urb->iso_frame_desc[0].actual_length == 3)
  557 + f &= 0x00ffffff;
  558 + else
  559 + f &= 0x0fffffff;
  560 + if (f == 0)
  561 + return 0;
576 562  
577   -/*
578   - * process after high speed playback sync complete
579   - *
580   - * retrieve the current 12.13 frequency from pipe, and set it.
581   - * the value is referred in prepare_playback_urb().
582   - */
583   -static int retire_playback_sync_urb_hs(struct snd_usb_substream *subs,
584   - struct snd_pcm_runtime *runtime,
585   - struct urb *urb)
586   -{
587   - unsigned int f;
588   - unsigned long flags;
589   -
590   - if (urb->iso_frame_desc[0].status == 0 &&
591   - urb->iso_frame_desc[0].actual_length == 4) {
592   - f = combine_quad((u8*)urb->transfer_buffer) & 0x0fffffff;
593   - if (f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax) {
594   - spin_lock_irqsave(&subs->lock, flags);
595   - subs->freqm = f;
596   - spin_unlock_irqrestore(&subs->lock, flags);
  563 + if (unlikely(subs->freqshift == INT_MIN)) {
  564 + /*
  565 + * The first time we see a feedback value, determine its format
  566 + * by shifting it left or right until it matches the nominal
  567 + * frequency value. This assumes that the feedback does not
  568 + * differ from the nominal value more than +50% or -25%.
  569 + */
  570 + shift = 0;
  571 + while (f < subs->freqn - subs->freqn / 4) {
  572 + f <<= 1;
  573 + shift++;
597 574 }
  575 + while (f > subs->freqn + subs->freqn / 2) {
  576 + f >>= 1;
  577 + shift--;
  578 + }
  579 + subs->freqshift = shift;
598 580 }
  581 + else if (subs->freqshift >= 0)
  582 + f <<= subs->freqshift;
  583 + else
  584 + f >>= -subs->freqshift;
599 585  
600   - return 0;
601   -}
602   -
603   -/*
604   - * process after E-Mu 0202/0404/Tracker Pre high speed playback sync complete
605   - *
606   - * These devices return the number of samples per packet instead of the number
607   - * of samples per microframe.
608   - */
609   -static int retire_playback_sync_urb_hs_emu(struct snd_usb_substream *subs,
610   - struct snd_pcm_runtime *runtime,
611   - struct urb *urb)
612   -{
613   - unsigned int f;
614   - unsigned long flags;
615   -
616   - if (urb->iso_frame_desc[0].status == 0 &&
617   - urb->iso_frame_desc[0].actual_length == 4) {
618   - f = combine_quad((u8*)urb->transfer_buffer) & 0x0fffffff;
619   - f >>= subs->datainterval;
620   - if (f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax) {
621   - spin_lock_irqsave(&subs->lock, flags);
622   - subs->freqm = f;
623   - spin_unlock_irqrestore(&subs->lock, flags);
624   - }
  586 + if (likely(f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax)) {
  587 + /*
  588 + * If the frequency looks valid, set it.
  589 + * This value is referred to in prepare_playback_urb().
  590 + */
  591 + spin_lock_irqsave(&subs->lock, flags);
  592 + subs->freqm = f;
  593 + spin_unlock_irqrestore(&subs->lock, flags);
  594 + } else {
  595 + /*
  596 + * Out of range; maybe the shift value is wrong.
  597 + * Reset it so that we autodetect again the next time.
  598 + */
  599 + subs->freqshift = INT_MIN;
625 600 }
626 601  
627 602 return 0;
... ... @@ -878,21 +853,6 @@
878 853 },
879 854 };
880 855  
881   -static struct snd_urb_ops audio_urb_ops_high_speed[2] = {
882   - {
883   - .prepare = prepare_nodata_playback_urb,
884   - .retire = retire_playback_urb,
885   - .prepare_sync = prepare_playback_sync_urb_hs,
886   - .retire_sync = retire_playback_sync_urb_hs,
887   - },
888   - {
889   - .prepare = prepare_capture_urb,
890   - .retire = retire_capture_urb,
891   - .prepare_sync = prepare_capture_sync_urb_hs,
892   - .retire_sync = retire_capture_sync_urb,
893   - },
894   -};
895   -
896 856 /*
897 857 * initialize the substream instance.
898 858 */
... ... @@ -909,23 +869,9 @@
909 869 subs->direction = stream;
910 870 subs->dev = as->chip->dev;
911 871 subs->txfr_quirk = as->chip->txfr_quirk;
912   - if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL) {
913   - subs->ops = audio_urb_ops[stream];
914   - } else {
915   - subs->ops = audio_urb_ops_high_speed[stream];
916   - switch (as->chip->usb_id) {
917   - case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */
918   - case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
919   - case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
920   - subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
921   - break;
922   - case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra 8 */
923   - case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
924   - subs->ops.prepare_sync = prepare_playback_sync_urb;
925   - subs->ops.retire_sync = retire_playback_sync_urb;
926   - break;
927   - }
928   - }
  872 + subs->ops = audio_urb_ops[stream];
  873 + if (snd_usb_get_speed(subs->dev) >= USB_SPEED_HIGH)
  874 + subs->ops.prepare_sync = prepare_capture_sync_urb_hs;
929 875  
930 876 snd_usb_set_pcm_ops(as->pcm, stream);
931 877