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

Commit 4633fa48 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3 

Conflicts:
	sound/soc/codecs/wm8940.c
parents 03431972 19940b3d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6001,7 +6001,7 @@ F: sound/ 
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

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

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

include/linux/mfd/wm8994/registers.h

+15 −0
Original line number Diff line number Diff line
@@ -1962,6 +1962,21 @@ 
#define WM8958_MICB2_DISCH_SHIFT                     0  /* MICB2_DISCH */

#define WM8958_MICB2_DISCH_WIDTH                     1  /* MICB2_DISCH */



/*

 * R210 (0xD2) - Mic Detect 3

 */

#define WM8958_MICD_LVL_MASK                    0x07FC  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_SHIFT                        2  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_WIDTH                        9  /* MICD_LVL - [10:2] */

#define WM8958_MICD_VALID                       0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_MASK                  0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_SHIFT                      1  /* MICD_VALID */

#define WM8958_MICD_VALID_WIDTH                      1  /* MICD_VALID */

#define WM8958_MICD_STS                         0x0001  /* MICD_STS */

#define WM8958_MICD_STS_MASK                    0x0001  /* MICD_STS */

#define WM8958_MICD_STS_SHIFT                        0  /* MICD_STS */

#define WM8958_MICD_STS_WIDTH                        1  /* MICD_STS */



/*

 * R76 (0x4C) - Charge Pump (1)

 */

sound/soc/codecs/tlv320aic23.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		iface_reg |= TLV320AIC23_MS_MASTER;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		iface_reg &= ~TLV320AIC23_MS_MASTER;

		break;

	default:

		return -EINVAL;

sound/soc/codecs/tlv320aic3x.c

+1 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		aic3x->master = 0;

		iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);

		break;

	default:

		return -EINVAL;

sound/soc/codecs/wm5100.c

+8 −4
Original line number Diff line number Diff line
@@ -2361,13 +2361,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip, 
{

	struct wm5100_priv *wm5100 = gpio_to_wm5100(chip);

	struct snd_soc_codec *codec = wm5100->codec;

	int val;

	int val, ret;



	val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT);



	return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,

	ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,

				  WM5100_GP1_FN_MASK | WM5100_GP1_DIR |

				  WM5100_GP1_LVL, val);

	if (ret < 0)

		return ret;

	else

		return 0;

}



static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset)