Commit ebfa3dcc authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/tlv320aic3x',... 

Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/topology', 'asoc/topic/wm0010', 'asoc/topic/wm8731' and 'asoc/topic/wm8741' into asoc-next
parents 166729f3 03303da5 fd340455 98856d5a dfa5def5 c9b0bdc7

sound/soc/codecs/tlv320aic3x.c

+6 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/codecs/wm0010.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

sound/soc/codecs/wm8731.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/codecs/wm8741.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-topology.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */