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

Commit 2af613d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Hopefully the final pull request for 3.19: this ended up with a
  slightly higher volume than wished, but I put them all as they are
  either stable or 3.19 regression fixes.

  Most of commits are from ASoC, and have been stewed for a while in
  linux-next.  The only change in the common code is the regression
  fixes for ASoC AC97 stuff wrt device registrations.  The rest are
  device-specific, mostly small fixes in various ASoC drivers and ak411x
  on ice1724 boards"

* tag 'sound-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
  ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs
  ASoC: sgtl5000: add delay before first I2C access
  MAINTAINERS: ASoC: add maintainer for Intel BDW/HSW ASoC driver
  ASoC: atmel_ssc_dai: fix the setting for DSP mode
  ASoC: sgtl5000: Use shift mask when setting codec mode
  ASoC: tlv320aic3x: Fix data delay configuration
  ALSA: ak411x: Fix stall in work callback
  ASoC: Intel: Used lock version to update shim registers
  ASoC: wm8731: init mutex in i2c init path
  ASoC: atmel_ssc_dai: fix start event for I2S mode
  ASoC: rt5640: Add RT5642 ACPI ID for Intel Baytrail
  ASoC: wm97xx: Reset AC'97 device before registering it
  ASoC: Add support for allocating AC'97 device before registering it
parents 48beb121 d2255c01

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4953,6 +4953,16 @@ F: Documentation/input/multi-touch-protocol.txt 
F:	drivers/input/input-mt.c

K:	\b(ABS|SYN)_MT_



INTEL ASoC BDW/HSW DRIVERS

M:	Jie Yang <yang.jie@linux.intel.com>

L:	alsa-devel@alsa-project.org

S:	Supported

F:	sound/soc/intel/sst-haswell*

F:	sound/soc/intel/sst-dsp*

F:	sound/soc/intel/sst-firmware.c

F:	sound/soc/intel/broadwell.c

F:	sound/soc/intel/haswell.c



INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Artur Paszkiewicz <artur.paszkiewicz@intel.com>

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";
@@ -378,7 +378,7 @@ 
	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

include/sound/ak4113.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct ak4113 { 
	ak4113_write_t *write;

	ak4113_read_t *read;

	void *private_data;

	unsigned int init:1;

	atomic_t wq_processing;

	spinlock_t lock;

	unsigned char regmap[AK4113_WRITABLE_REGS];

	struct snd_kcontrol *kctls[AK4113_CONTROLS];

include/sound/ak4114.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ struct ak4114 { 
	ak4114_write_t * write;

	ak4114_read_t * read;

	void * private_data;

	unsigned int init: 1;

	atomic_t wq_processing;

	spinlock_t lock;

	unsigned char regmap[6];

	unsigned char txcsb[5];

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, 
				unsigned int mask, unsigned int value);



#ifdef CONFIG_SND_SOC_AC97_BUS

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec);

void snd_soc_free_ac97_codec(struct snd_ac97 *ac97);