Updated from Linux LTS 3.10.25 to 3.10.26
This commit is contained in:
@@ -897,7 +897,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
|
||||
{ "HPOUT2R", NULL, "OUT2R" },
|
||||
|
||||
{ "HPOUT3L", NULL, "OUT3L" },
|
||||
{ "HPOUT3R", NULL, "OUT3L" },
|
||||
{ "HPOUT3R", NULL, "OUT3R" },
|
||||
|
||||
{ "SPKOUTLN", NULL, "OUT4L" },
|
||||
{ "SPKOUTLP", NULL, "OUT4L" },
|
||||
|
||||
@@ -1449,7 +1449,7 @@ static int wm8904_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
||||
case SND_SOC_DAIFMT_DSP_B:
|
||||
aif1 |= WM8904_AIF_LRCLK_INV;
|
||||
aif1 |= 0x3 | WM8904_AIF_LRCLK_INV;
|
||||
case SND_SOC_DAIFMT_DSP_A:
|
||||
aif1 |= 0x3;
|
||||
break;
|
||||
|
||||
@@ -1073,13 +1073,17 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
|
||||
return ret;
|
||||
|
||||
/* Wait for the RAM to start, should be near instantaneous */
|
||||
count = 0;
|
||||
do {
|
||||
for (count = 0; count < 10; ++count) {
|
||||
ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1,
|
||||
&val);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
} while (!(val & ADSP2_RAM_RDY) && ++count < 10);
|
||||
|
||||
if (val & ADSP2_RAM_RDY)
|
||||
break;
|
||||
|
||||
msleep(1);
|
||||
}
|
||||
|
||||
if (!(val & ADSP2_RAM_RDY)) {
|
||||
adsp_err(dsp, "Failed to start DSP RAM\n");
|
||||
|
||||
Reference in New Issue
Block a user