renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/topology', 'asoc/topic/wm0010', 'asoc/topic/wm8731' and 'asoc/topic/wm8741' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2017-02-19 16:37:01 +00:00
commit ebfa3dccd2
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/tlv320aic3x.c
View File

@ -1393,6 +1393,12 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)
snd_soc_write(codec, AIC3X_PLL_PROGC_REG, pll_c);
snd_soc_write(codec, AIC3X_PLL_PROGD_REG, pll_d);
}
/*
* Delay is needed to reduce pop-noise after syncing back the
* registers
*/
mdelay(50);
} else {
/*
* Do soft reset to this codec instance in order to clear

1
sound/soc/codecs/wm0010.c
View File

@ -21,7 +21,6 @@
#include <linux/firmware.h>
#include <linux/delay.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/mutex.h>

2
sound/soc/codecs/wm8731.h
View File

@ -31,8 +31,8 @@
#define WM8731_CACHEREGNUM 10
#define WM8731_SYSCLK_MCLK 0
#define WM8731_SYSCLK_XTAL 1
#define WM8731_SYSCLK_MCLK 2
#define WM8731_DAI 0

2
sound/soc/codecs/wm8741.c
View File

@ -37,8 +37,6 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = {
"DVDD",
};
#define WM8741_NUM_RATES 6
/* codec private data */
struct wm8741_priv {
struct wm8741_platform_data pdata;

4
sound/soc/soc-topology.c
View File

@ -1871,7 +1871,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
{
struct snd_soc_tplg_pcm *pcm, *_pcm;
int count = hdr->count;
int i, err;
int i;
bool abi_match;
if (tplg->pass != SOC_TPLG_PASS_PCM_DAI)
@ -1905,7 +1905,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
_pcm = pcm;
} else {
abi_match = false;
err = pcm_new_ver(tplg, pcm, &_pcm);
pcm_new_ver(tplg, pcm, &_pcm);
}
/* create the FE DAIs and DAI links */