Commit 16ca41c6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8988' and... 

Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next
parents dacff834 75aa8868 b682d7ba 57b7068d

Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Bindings for I2S controller built into xtfpga Xtensa bitstreams.



Required properties:

- compatible: shall be "cdns,xtfpga-i2s".

- reg: memory region (address and length) with device registers.

- interrupts: interrupt for the device.

- clocks: phandle to the clk used as master clock. I2S bus clock

  is derived from it.



Examples:



	i2s0: xtfpga-i2s@0d080000 {

		#sound-dai-cells = <0>;

		compatible = "cdns,xtfpga-i2s";

		reg = <0x0d080000 0x40>;

		interrupts = <2 1>;

		clocks = <&cdce706 4>;

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10669,6 +10669,7 @@ M: Max Filippov <jcmvbkbc@gmail.com> 
L:	linux-xtensa@linux-xtensa.org

S:	Maintained

F:	drivers/spi/spi-xtensa-xtfpga.c

F:	sound/soc/xtensa/xtfpga-i2s.c



YAM DRIVER FOR AX.25

M:	Jean-Paul Roubelat <jpr@f6fbb.org>

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ source "sound/soc/spear/Kconfig" 
source "sound/soc/tegra/Kconfig"

source "sound/soc/txx9/Kconfig"

source "sound/soc/ux500/Kconfig"

source "sound/soc/xtensa/Kconfig"



# Supported codecs

source "sound/soc/codecs/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,3 +36,4 @@ obj-$(CONFIG_SND_SOC) += spear/ 
obj-$(CONFIG_SND_SOC)	+= tegra/

obj-$(CONFIG_SND_SOC)	+= txx9/

obj-$(CONFIG_SND_SOC)	+= ux500/

obj-$(CONFIG_SND_SOC)	+= xtensa/

sound/soc/codecs/wm8960.c

+48 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/clk.h>

#include <linux/i2c.h>

#include <linux/slab.h>

#include <sound/core.h>
@@ -117,6 +118,7 @@ static bool wm8960_volatile(struct device *dev, unsigned int reg) 
}



struct wm8960_priv {

	struct clk *mclk;

	struct regmap *regmap;

	int (*set_bias_level)(struct snd_soc_codec *,

			      enum snd_soc_bias_level level);
@@ -618,16 +620,40 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec, 
				      enum snd_soc_bias_level level)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);

	int ret;



	switch (level) {

	case SND_SOC_BIAS_ON:

		break;



	case SND_SOC_BIAS_PREPARE:

		switch (codec->dapm.bias_level) {

		case SND_SOC_BIAS_STANDBY:

			if (!IS_ERR(wm8960->mclk)) {

				ret = clk_prepare_enable(wm8960->mclk);

				if (ret) {

					dev_err(codec->dev,

						"Failed to enable MCLK: %d\n",

						ret);

					return ret;

				}

			}



			/* Set VMID to 2x50k */

			snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80);

			break;



		case SND_SOC_BIAS_ON:

			if (!IS_ERR(wm8960->mclk))

				clk_disable_unprepare(wm8960->mclk);

			break;



		default:

			break;

		}



		break;



	case SND_SOC_BIAS_STANDBY:

		if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {

			regcache_sync(wm8960->regmap);
@@ -674,7 +700,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec, 
					 enum snd_soc_bias_level level)

{

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);

	int reg;

	int reg, ret;



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -715,9 +741,22 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec, 
					    WM8960_VREF, WM8960_VREF);



			msleep(100);



			if (!IS_ERR(wm8960->mclk)) {

				ret = clk_prepare_enable(wm8960->mclk);

				if (ret) {

					dev_err(codec->dev,

						"Failed to enable MCLK: %d\n",

						ret);

					return ret;

				}

			}

			break;



		case SND_SOC_BIAS_ON:

			if (!IS_ERR(wm8960->mclk))

				clk_disable_unprepare(wm8960->mclk);



			/* Enable anti-pop mode */

			snd_soc_update_bits(codec, WM8960_APOP1,

					    WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -1002,6 +1041,12 @@ static int wm8960_i2c_probe(struct i2c_client *i2c, 
	if (wm8960 == NULL)

		return -ENOMEM;



	wm8960->mclk = devm_clk_get(&i2c->dev, "mclk");

	if (IS_ERR(wm8960->mclk)) {

		if (PTR_ERR(wm8960->mclk) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

	}



	wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap);

	if (IS_ERR(wm8960->regmap))

		return PTR_ERR(wm8960->regmap);