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

Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx',... 

Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx', 'asoc/fix/wm8904' and 'asoc/fix/wm8962' into asoc-linus
parents ab5cf7df f8f2dc4a 34198710 97aff2c0 4eb0f7ab

include/sound/soc.h

+4 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p  = (tlv_array),\

	.info = snd_soc_info_volsw, \

	.info = snd_soc_info_volsw_sx, \

	.get = snd_soc_get_volsw_sx,\

	.put = snd_soc_put_volsw_sx, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -156,7 +156,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p  = (tlv_array), \

	.info = snd_soc_info_volsw, \

	.info = snd_soc_info_volsw_sx, \

	.get = snd_soc_get_volsw_sx, \

	.put = snd_soc_put_volsw_sx, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -574,6 +574,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_volsw_sx(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_info *uinfo);

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono_info

int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

include/sound/wm8904.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
#define WM8904_MIC_REGS  2

#define WM8904_GPIO_REGS 4

#define WM8904_DRC_REGS  4

#define WM8904_EQ_REGS   25

#define WM8904_EQ_REGS   24



/**

 * DRC configurations are specified with a label and a set of register

sound/soc/codecs/rt298.c

+13 −13
Original line number Diff line number Diff line
@@ -50,24 +50,24 @@ struct rt298_priv { 
};



static struct reg_default rt298_index_def[] = {

	{ 0x01, 0xaaaa },

	{ 0x02, 0x8aaa },

	{ 0x01, 0xa5a8 },

	{ 0x02, 0x8e95 },

	{ 0x03, 0x0002 },

	{ 0x04, 0xaf01 },

	{ 0x08, 0x000d },

	{ 0x09, 0xd810 },

	{ 0x0a, 0x0120 },

	{ 0x04, 0xaf67 },

	{ 0x08, 0x200f },

	{ 0x09, 0xd010 },

	{ 0x0a, 0x0100 },

	{ 0x0b, 0x0000 },

	{ 0x0d, 0x2800 },

	{ 0x0f, 0x0000 },

	{ 0x19, 0x0a17 },

	{ 0x0f, 0x0022 },

	{ 0x19, 0x0217 },

	{ 0x20, 0x0020 },

	{ 0x33, 0x0208 },

	{ 0x46, 0x0300 },

	{ 0x49, 0x0004 },

	{ 0x4f, 0x50e9 },

	{ 0x50, 0x2000 },

	{ 0x63, 0x2902 },

	{ 0x49, 0x4004 },

	{ 0x4f, 0x50c9 },

	{ 0x50, 0x3000 },

	{ 0x63, 0x1b02 },

	{ 0x67, 0x1111 },

	{ 0x68, 0x1016 },

	{ 0x69, 0x273f },
@@ -1214,7 +1214,7 @@ static int rt298_i2c_probe(struct i2c_client *i2c, 
	mdelay(10);



	if (!rt298->pdata.gpio2_en)

		regmap_write(rt298->regmap, RT298_SET_DMIC2_DEFAULT, 0x4000);

		regmap_write(rt298->regmap, RT298_SET_DMIC2_DEFAULT, 0x40);

	else

		regmap_write(rt298->regmap, RT298_SET_DMIC2_DEFAULT, 0);

sound/soc/codecs/wm8962.c

+2 −0
Original line number Diff line number Diff line
@@ -3808,6 +3808,8 @@ static int wm8962_runtime_resume(struct device *dev) 


	wm8962_reset(wm8962);



	regcache_mark_dirty(wm8962->regmap);



	/* SYSCLK defaults to on; make sure it is off so we can safely

	 * write to registers if the device is declocked.

	 */

sound/soc/soc-ops.c

+28 −0
Original line number Diff line number Diff line
@@ -206,6 +206,34 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(snd_soc_info_volsw);



/**

 * snd_soc_info_volsw_sx - Mixer info callback for SX TLV controls

 * @kcontrol: mixer control

 * @uinfo: control element information

 *

 * Callback to provide information about a single mixer control, or a double

 * mixer control that spans 2 registers of the SX TLV type. SX TLV controls

 * have a range that represents both positive and negative values either side

 * of zero but without a sign bit.

 *

 * Returns 0 for success.

 */

int snd_soc_info_volsw_sx(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_info *uinfo)

{

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;



	snd_soc_info_volsw(kcontrol, uinfo);

	/* Max represents the number of levels in an SX control not the

	 * maximum value, so add the minimum value back on

	 */

	uinfo->value.integer.max += mc->min;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_info_volsw_sx);



/**

 * snd_soc_get_volsw - single mixer get callback

 * @kcontrol: mixer control