Commit graph

401774 commits

Author SHA1 Message Date
Takashi Iwai
a6bc732b5a ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
 downgrades of BUG()s from Takashi.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSfQOIAAoJELSic+t+oim9LAEQAJYKPUcjUM81aK05UuapJEgP
 X1SJ4FP/SRkmQXaTEd+1cd8owD0qcYH1EFeUfK80vmXIaare+pPhAUGKfkJZeR26
 SzC34tJ5TjeQ3Is+2a0mymih8v+03iG7+s/4XSSxk7X+t/T3tr/1KvL96+Bvt/Fp
 /u+MzLOzTS3rMFfGX5kT2FARe9k941BnEsbRLrz7NAM//zSOpNzht+9bKWOKu0zp
 s8W3zqZc4zZxKuqweyo5F9++Nfcd+4lt7JqaB1veHHMuWhQmsmi1rAnAGWAVcoK8
 f70GAGY147BPCfdyWG3A9RRmZ5xlIGFA60XfCOr2c0Pz2Bo165p8sLGrctM9nOvq
 7+hrxK2X0jQGrQ774obaxqegm+YhAy2zl5ZhDXeu6io+Pg9kb98la0kO4SSkQGH9
 +HghpcFTdvk32pB9u4FzZ5Fp9/1OZHVGMBRp13Bs8ucZRqznvOIhFbeEV1yw4CPT
 /0zv4+ujTwtEJT7mN9CjtKuRbd9A3rpYSxK3d6MJkGNfwWC1vmwjTx02ryA4FVxs
 Evo/9ANfLgt7a7Cmt1avbZ1T1GNMZ6zvFpI1/6Zv6AT6oZhfBdMn/0iSnWunqNC/
 G0ppe/TQrFHpNSW6Z/FsWb3C/S7/HvWKObcWSjezAZLaLPxEZc61NrgP7ZNap7l1
 yNOtdb6HL7i569QU1SAc
 =osG+
 -----END PGP SIGNATURE-----

Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.13

Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
2013-11-08 16:45:38 +01:00
Kailang Yang
9a22a8f558 ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported
New codec ALC255/ALC3234 support multifunction jacks.
It used for menual select the input device.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08 13:52:59 +01:00
Takashi Iwai
885845d785 ALSA: hda - Apply MacBook fixups for CS4208 correctly
The commit [8fe7b65ab4: ALSA: hda - Apply GPIO setup for MacBooks
with CS4208] added a fixup entry matching with the vendor id 0x106b.
This broke the fixups for previous MBA6,1 and 6,2, since the PCI SSID
vendor id matches before evaluating the codec SSIDs.

We had a similar issue on Mac with Sigmatel codecs, and solve this
problem again similarly, by introducing a skeleton entry matching with
the all MacBooks, then remap to the right one.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64401
Fixes: 8fe7b65ab4 ('ALSA: hda - Apply GPIO setup for MacBooks with CS4208')
Cc: <stable@vger.kernel.org> [v3.12+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08 13:50:56 +01:00
Mark Brown
dd212bd5bb Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next 2013-11-08 10:43:43 +00:00
Mark Brown
22b468a06e Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2013-11-08 10:43:42 +00:00
Mark Brown
552b747564 Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next 2013-11-08 10:43:42 +00:00
Mark Brown
a941145d2b Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next 2013-11-08 10:43:41 +00:00
Mark Brown
108145a606 Merge remote-tracking branch 'asoc/topic/warn' into asoc-next 2013-11-08 10:43:41 +00:00
Mark Brown
022aa51e3f Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next 2013-11-08 10:43:40 +00:00
Mark Brown
88cb5111e8 Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next 2013-11-08 10:43:40 +00:00
Mark Brown
86408059df Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next 2013-11-08 10:43:40 +00:00
Mark Brown
b24a63d5ef Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next 2013-11-08 10:43:39 +00:00
Mark Brown
32b7fdfefa Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next 2013-11-08 10:43:39 +00:00
Mark Brown
abdf150ade Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next 2013-11-08 10:43:38 +00:00
Mark Brown
e029530075 Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next 2013-11-08 10:43:38 +00:00
Mark Brown
d4af6be4f8 Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next 2013-11-08 10:43:37 +00:00
Mark Brown
be529a5b7f Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next 2013-11-08 10:43:37 +00:00
Mark Brown
6c61bbf0e8 Merge remote-tracking branch 'asoc/topic/spear' into asoc-next 2013-11-08 10:43:36 +00:00
Mark Brown
bd6d35a370 Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next 2013-11-08 10:43:36 +00:00
Mark Brown
8bffb007a5 Merge remote-tracking branch 'asoc/topic/simple' into asoc-next 2013-11-08 10:43:35 +00:00
Mark Brown
6a2972b363 Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next 2013-11-08 10:43:35 +00:00
Mark Brown
87373ad1f3 Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next 2013-11-08 10:43:35 +00:00
Mark Brown
457eb9016b Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next 2013-11-08 10:43:34 +00:00
Mark Brown
9686e4b2a8 Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next 2013-11-08 10:43:34 +00:00
Mark Brown
469cb9286e Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next 2013-11-08 10:43:33 +00:00
Mark Brown
df8aabe442 Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next 2013-11-08 10:43:33 +00:00
Mark Brown
97df0a0538 Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next 2013-11-08 10:43:32 +00:00
Mark Brown
5ac452772f Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next 2013-11-08 10:43:32 +00:00
Mark Brown
672922e975 Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next 2013-11-08 10:43:31 +00:00
Mark Brown
efdf09add9 Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next 2013-11-08 10:43:31 +00:00
Mark Brown
c462b1d8bb Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next 2013-11-08 10:43:31 +00:00
Mark Brown
b8a77af201 Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next 2013-11-08 10:43:30 +00:00
Mark Brown
5f343663a2 Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next 2013-11-08 10:43:30 +00:00
Mark Brown
ca2b2252fc Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next 2013-11-08 10:43:29 +00:00
Mark Brown
ec7118e391 Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next 2013-11-08 10:43:29 +00:00
Mark Brown
3352b80075 Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next 2013-11-08 10:43:28 +00:00
Mark Brown
6157e734de Merge remote-tracking branch 'asoc/topic/doc' into asoc-next 2013-11-08 10:43:28 +00:00
Mark Brown
99a0ea2d5b Merge remote-tracking branch 'asoc/topic/devm' into asoc-next 2013-11-08 10:43:27 +00:00
Mark Brown
ac97d4e00a Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next 2013-11-08 10:43:27 +00:00
Mark Brown
1d697db0ab Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next 2013-11-08 10:43:26 +00:00
Mark Brown
2029ef2500 Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-next 2013-11-08 10:43:26 +00:00
Mark Brown
491f06b160 Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next 2013-11-08 10:43:25 +00:00
Mark Brown
477ce17dec Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next 2013-11-08 10:43:25 +00:00
Mark Brown
c6016bdeab Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2013-11-08 10:43:25 +00:00
Mark Brown
d20b09f0c5 Merge remote-tracking branch 'asoc/topic/component' into asoc-next 2013-11-08 10:43:24 +00:00
Mark Brown
2fc175c4a3 Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next 2013-11-08 10:43:24 +00:00
Mark Brown
aff79f8282 Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2013-11-08 10:43:23 +00:00
Mark Brown
642cba7528 Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next 2013-11-08 10:43:23 +00:00
Mark Brown
74858f23ca Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next 2013-11-08 10:43:22 +00:00
Mark Brown
5176dfcd47 Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next 2013-11-08 10:43:22 +00:00