Unverified Commit 25c7b6cc authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/uniphier', 'asoc/topic/utils',... 

Merge remote-tracking branches 'asoc/topic/uniphier', 'asoc/topic/utils', 'asoc/topic/ux500', 'asoc/topic/wm0010' and 'asoc/topic/wm2000' into asoc-next
parents 535f9af4 576f8f46 494665a0 1783c9d7 316c85c3 bf0842ba

Documentation/devicetree/bindings/sound/uniphier,evea.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Socionext EVEA - UniPhier SoC internal codec driver



Required properties:

- compatible      : should be "socionext,uniphier-evea".

- reg             : offset and length of the register set for the device.

- clock-names     : should include following entries:

                    "evea", "exiv"

- clocks          : a list of phandle, should contain an entry for each

                    entries in clock-names.

- reset-names     : should include following entries:

                    "evea", "exiv", "adamv"

- resets          : a list of phandle, should contain reset entries of

                    reset-names.

- #sound-dai-cells: should be 1.



Example:



	codec {

		compatible = "socionext,uniphier-evea";

		reg = <0x57900000 0x1000>;

		clock-names = "evea", "exiv";

		clocks = <&sys_clk 41>, <&sys_clk 42>;

		reset-names = "evea", "exiv", "adamv";

		resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>;

		#sound-dai-cells = <1>;

	};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -12592,6 +12592,12 @@ F: include/media/soc* 
F:	drivers/media/i2c/soc_camera/

F:	drivers/media/platform/soc_camera/



SOCIONEXT UNIPHIER SOUND DRIVER

M:	Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	sound/soc/uniphier/



SOEKRIS NET48XX LED SUPPORT

M:	Chris Boot <bootc@bootc.net>

S:	Maintained

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ source "sound/soc/stm/Kconfig" 
source "sound/soc/sunxi/Kconfig"

source "sound/soc/tegra/Kconfig"

source "sound/soc/txx9/Kconfig"

source "sound/soc/uniphier/Kconfig"

source "sound/soc/ux500/Kconfig"

source "sound/soc/xtensa/Kconfig"

source "sound/soc/zte/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ obj-$(CONFIG_SND_SOC) += stm/ 
obj-$(CONFIG_SND_SOC)	+= sunxi/

obj-$(CONFIG_SND_SOC)	+= tegra/

obj-$(CONFIG_SND_SOC)	+= txx9/

obj-$(CONFIG_SND_SOC)	+= uniphier/

obj-$(CONFIG_SND_SOC)	+= ux500/

obj-$(CONFIG_SND_SOC)	+= xtensa/

obj-$(CONFIG_SND_SOC)	+= zte/

sound/soc/codecs/wm0010.c

+1 −4
Original line number Diff line number Diff line
@@ -655,11 +655,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		ret = -ENOMEM;

		len = pll_rec.length + 8;

		out = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!out) {

			dev_err(codec->dev,

				"Failed to allocate RX buffer\n");

		if (!out)

			goto abort;

		}



		img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!img_swap)