Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a34689d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull more sound fixes from Takashi Iwai:
 "Yet more (a bunch of) small fixes that slipped from the previous pull
  request.  Most of commits are pending ASoC fixes, all of which are
  fairly trivial commits."

* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: wm8904: correct the index
  ALSA: hda - Yet another position_fix quirk for ASUS machines
  ASoC: tegra: fix maxburst settings in dmaengine code
  ASoC: samsung dma - Don't indicate support for pause/resume.
  ASoC: mc13783: Remove mono support
  ASoC: arizona: Fix typo in 44.1kHz rates
  ASoC: spear: correct the check for NULL dma_buffer pointer
  sound: tegra_alc5632: remove HP detect GPIO inversion
  ASoC: atmel-ssc: include linux/io.h for raw io
  ASoC: dapm: Don't force card bias level to be updated
  ASoC: dapm: Make sure we update the bias level for CODECs with no op
  ASoC: am3517evm: fix error return code
  ASoC: ux500_msp_i2s: better use devm functions and fix error return code
  ASoC: imx-sgtl5000: fix error return code
parents 37407ea7 5d037f90

include/linux/atmel-ssc.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/platform_device.h>

#include <linux/list.h>

#include <linux/io.h>



struct ssc_device {

	struct list_head	list;

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2701,6 +2701,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x1ac3, "ASUS X53S", POS_FIX_POSBUF),

	SND_PCI_QUIRK(0x1043, 0x1b43, "ASUS K53E", POS_FIX_POSBUF),

	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),

sound/soc/codecs/arizona.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static const int arizona_44k1_bclk_rates[] = { 
	940800,

	1411200,

	1881600,

	2882400,

	2822400,

	3763200,

	5644800,

	7526400,

sound/soc/codecs/mc13783.c

+4 −4
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static struct snd_soc_dai_driver mc13783_dai_async[] = { 
		.id = MC13783_ID_STEREO_DAC,

		.playback = {

			.stream_name = "Playback",

			.channels_min = 1,

			.channels_min = 2,

			.channels_max = 2,

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = MC13783_FORMATS,
@@ -670,7 +670,7 @@ static struct snd_soc_dai_driver mc13783_dai_async[] = { 
		.id = MC13783_ID_STEREO_CODEC,

		.capture = {

			.stream_name = "Capture",

			.channels_min = 1,

			.channels_min = 2,

			.channels_max = 2,

			.rates = MC13783_RATES_RECORD,

			.formats = MC13783_FORMATS,
@@ -692,14 +692,14 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = { 
		.id = MC13783_ID_SYNC,

		.playback = {

			.stream_name = "Playback",

			.channels_min = 1,

			.channels_min = 2,

			.channels_max = 2,

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = MC13783_FORMATS,

		},

		.capture = {

			.stream_name = "Capture",

			.channels_min = 1,

			.channels_min = 2,

			.channels_max = 2,

			.rates = MC13783_RATES_RECORD,

			.formats = MC13783_FORMATS,

sound/soc/codecs/wm8904.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static const struct reg_default wm8904_reg_defaults[] = { 
	{ 14,  0x0000 },     /* R14  - Power Management 2 */

	{ 15,  0x0000 },     /* R15  - Power Management 3 */

	{ 18,  0x0000 },     /* R18  - Power Management 6 */

	{ 19,  0x945E },     /* R20  - Clock Rates 0 */

	{ 20,  0x945E },     /* R20  - Clock Rates 0 */

	{ 21,  0x0C05 },     /* R21  - Clock Rates 1 */

	{ 22,  0x0006 },     /* R22  - Clock Rates 2 */

	{ 24,  0x0050 },     /* R24  - Audio Interface 0 */