mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 13:13:57 +08:00
Merge branch 'for-3.2' into for-3.3
Conflicts: sound/soc/codecs/wm8940.c
This commit is contained in:
commit
4633fa48fb
@ -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
|
||||
|
@ -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)
|
||||
*/
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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,
|
||||
WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
|
||||
WM5100_GP1_LVL, val);
|
||||
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)
|
||||
|
@ -151,7 +151,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
|
||||
u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3;
|
||||
int i = get_coeff(wm8711->sysclk, params_rate(params));
|
||||
u16 srate = (coeff_div[i].sr << 2) |
|
||||
(coeff_div[i].bosr << 1) | coeff_div[i].usb;
|
||||
@ -232,7 +232,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
u16 iface = 0;
|
||||
u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
|
@ -867,7 +867,7 @@ SOC_ENUM("Right Capture Mode", rin_mode),
|
||||
SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0,
|
||||
WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0),
|
||||
SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,
|
||||
WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0),
|
||||
WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1),
|
||||
|
||||
SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),
|
||||
SOC_ENUM("High Pass Filter Mode", hpf_mode),
|
||||
|
@ -488,6 +488,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
|
||||
break;
|
||||
}
|
||||
|
||||
codec->dapm.bias_level = level;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -619,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
|
||||
|
||||
switch (div_id) {
|
||||
case WM8940_BCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFEF3;
|
||||
reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3;
|
||||
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2));
|
||||
break;
|
||||
case WM8940_MCLKDIV:
|
||||
|
@ -1961,7 +1961,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re
|
||||
|
||||
static int wm8962_reset(struct snd_soc_codec *codec)
|
||||
{
|
||||
return snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
|
||||
int ret;
|
||||
|
||||
ret = snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
return snd_soc_write(codec, WM8962_PLL_SOFTWARE_RESET, 0);
|
||||
}
|
||||
|
||||
static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0);
|
||||
@ -2360,15 +2366,14 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
|
||||
|
||||
snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
|
||||
WM8962_FLL_ENA, WM8962_FLL_ENA);
|
||||
if (wm8962->irq) {
|
||||
timeout = msecs_to_jiffies(5);
|
||||
timeout = wait_for_completion_timeout(&wm8962->fll_lock,
|
||||
timeout);
|
||||
|
||||
if (timeout == 0)
|
||||
dev_err(codec->dev,
|
||||
"Timed out starting FLL\n");
|
||||
}
|
||||
timeout = msecs_to_jiffies(5);
|
||||
timeout = wait_for_completion_timeout(&wm8962->fll_lock,
|
||||
timeout);
|
||||
|
||||
if (wm8962->irq && timeout == 0)
|
||||
dev_err(codec->dev,
|
||||
"Timed out starting FLL\n");
|
||||
}
|
||||
break;
|
||||
|
||||
@ -4049,6 +4054,11 @@ static int wm8962_probe(struct snd_soc_codec *codec)
|
||||
snd_soc_update_bits(codec, WM8962_CLOCKING2,
|
||||
WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
|
||||
|
||||
/* Ensure that the oscillator and PLLs are disabled */
|
||||
snd_soc_update_bits(codec, WM8962_PLL2,
|
||||
WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
|
||||
0);
|
||||
|
||||
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
|
||||
|
||||
if (pdata) {
|
||||
|
@ -56,7 +56,7 @@ static int wm8994_retune_mobile_base[] = {
|
||||
static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg)
|
||||
{
|
||||
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8994 *control = wm8994->control_data;
|
||||
struct wm8994 *control = codec->control_data;
|
||||
|
||||
switch (reg) {
|
||||
case WM8994_GPIO_1:
|
||||
@ -3030,19 +3030,34 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
|
||||
{
|
||||
struct wm8994_priv *wm8994 = data;
|
||||
struct snd_soc_codec *codec = wm8994->codec;
|
||||
int reg;
|
||||
int reg, count;
|
||||
|
||||
reg = snd_soc_read(codec, WM8958_MIC_DETECT_3);
|
||||
if (reg < 0) {
|
||||
dev_err(codec->dev, "Failed to read mic detect status: %d\n",
|
||||
reg);
|
||||
return IRQ_NONE;
|
||||
}
|
||||
/* We may occasionally read a detection without an impedence
|
||||
* range being provided - if that happens loop again.
|
||||
*/
|
||||
count = 10;
|
||||
do {
|
||||
reg = snd_soc_read(codec, WM8958_MIC_DETECT_3);
|
||||
if (reg < 0) {
|
||||
dev_err(codec->dev,
|
||||
"Failed to read mic detect status: %d\n",
|
||||
reg);
|
||||
return IRQ_NONE;
|
||||
}
|
||||
|
||||
if (!(reg & WM8958_MICD_VALID)) {
|
||||
dev_dbg(codec->dev, "Mic detect data not valid\n");
|
||||
goto out;
|
||||
}
|
||||
if (!(reg & WM8958_MICD_VALID)) {
|
||||
dev_dbg(codec->dev, "Mic detect data not valid\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!(reg & WM8958_MICD_STS) || (reg & WM8958_MICD_LVL_MASK))
|
||||
break;
|
||||
|
||||
msleep(1);
|
||||
} while (count--);
|
||||
|
||||
if (count == 0)
|
||||
dev_warn(codec->dev, "No impedence range reported for jack\n");
|
||||
|
||||
#ifndef CONFIG_SND_SOC_WM8994_MODULE
|
||||
trace_snd_soc_jack_irq(dev_name(codec->dev));
|
||||
@ -3180,9 +3195,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
|
||||
|
||||
wm8994_request_irq(codec->control_data, WM8994_IRQ_FIFOS_ERR,
|
||||
wm8994_fifo_error, "FIFO error", codec);
|
||||
wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_WARN,
|
||||
wm8994_request_irq(codec->control_data, WM8994_IRQ_TEMP_WARN,
|
||||
wm8994_temp_warn, "Thermal warning", codec);
|
||||
wm8994_request_irq(wm8994->control_data, WM8994_IRQ_TEMP_SHUT,
|
||||
wm8994_request_irq(codec->control_data, WM8994_IRQ_TEMP_SHUT,
|
||||
wm8994_temp_shut, "Thermal shutdown", codec);
|
||||
|
||||
ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
|
||||
|
Loading…
Reference in New Issue
Block a user