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

Commit 93cd0004 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "The pending last-minute ASoC fixes, all of which are driver-local
  (tlv320aic3x, rcar, pcm1681, pcm1792a, omap, fsl) and should be pretty
  safe to apply"

* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: Add MAINTAINERS entry for dmaengine helpers
  ASoC: pcm1792a: Fix max_register setting
  ASoC: pcm1681: Fix max_register setting
  ASoC: pcm1681: Fix max_register setting
  ASoC: rcar: fixup generation checker
  ASoC: tlv320aic3x: Connect 'Left Line1R Mux' and 'Right Line1L Mux'
  ASoC: fsl: imx-ssi: fix probe on imx31
  ASoC: omap: Fix incorrect ARM dependency
  ASoC: fsl: Fix sound on mx31moboard
  ASoC: fsl_ssi: Fix irq_of_parse_and_map() return value check
parents d24fec39 d7f8761b

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7822,6 +7822,13 @@ F: Documentation/sound/alsa/soc/ 
F:	sound/soc/

F:	include/sound/soc*



SOUND - DMAENGINE HELPERS

M:	Lars-Peter Clausen <lars@metafoo.de>

S:	Supported

F:	include/sound/dmaengine_pcm.h

F:	sound/core/pcm_dmaengine.c

F:	sound/soc/soc-generic-dmaengine-pcm.c



SPARC + UltraSPARC (sparc/sparc64)

M:	"David S. Miller" <davem@davemloft.net>

L:	sparclinux@vger.kernel.org

include/sound/rcar_snd.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { 
 *

 * A : generation

 */

#define RSND_GEN_MASK	(0xF << 0)

#define RSND_GEN1	(1 << 0) /* fixme */

#define RSND_GEN2	(2 << 0) /* fixme */

sound/soc/codecs/pcm1681.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids); 
static const struct regmap_config pcm1681_regmap = {

	.reg_bits		= 8,

	.val_bits		= 8,

	.max_register		= ARRAY_SIZE(pcm1681_reg_defaults) + 1,

	.max_register		= 0x13,

	.reg_defaults		= pcm1681_reg_defaults,

	.num_reg_defaults	= ARRAY_SIZE(pcm1681_reg_defaults),

	.writeable_reg		= pcm1681_writeable_reg,

sound/soc/codecs/pcm1792a.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ MODULE_DEVICE_TABLE(of, pcm1792a_of_match); 
static const struct regmap_config pcm1792a_regmap = {

	.reg_bits		= 8,

	.val_bits		= 8,

	.max_register		= 24,

	.max_register		= 23,

	.reg_defaults		= pcm1792a_reg_defaults,

	.num_reg_defaults	= ARRAY_SIZE(pcm1792a_reg_defaults),

	.writeable_reg		= pcm1792a_writeable_reg,

sound/soc/codecs/tlv320aic3x.c

+4 −0
Original line number Diff line number Diff line
@@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	/* Left Input */

	{"Left Line1L Mux", "single-ended", "LINE1L"},

	{"Left Line1L Mux", "differential", "LINE1L"},

	{"Left Line1R Mux", "single-ended", "LINE1R"},

	{"Left Line1R Mux", "differential", "LINE1R"},



	{"Left Line2L Mux", "single-ended", "LINE2L"},

	{"Left Line2L Mux", "differential", "LINE2L"},
@@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = { 
	/* Right Input */

	{"Right Line1R Mux", "single-ended", "LINE1R"},

	{"Right Line1R Mux", "differential", "LINE1R"},

	{"Right Line1L Mux", "single-ended", "LINE1L"},

	{"Right Line1L Mux", "differential", "LINE1L"},



	{"Right Line2R Mux", "single-ended", "LINE2R"},

	{"Right Line2R Mux", "differential", "LINE2R"},