Unverified Commit c966b3cc authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42l73',... 

Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42l73', 'asoc/topic/cs47l24', 'asoc/topic/cx20442' and 'asoc/topic/da7213' into asoc-next
parents 5c81e9be e8d8b98c 68fa08c6 ba8dd49f 39b5a0f8 8080699a

sound/soc/codecs/cs42l56.c

+4 −9
Original line number Diff line number Diff line
@@ -1190,9 +1190,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int alpha_rev, metal_rev;

	unsigned int reg;



	cs42l56 = devm_kzalloc(&i2c_client->dev,

			       sizeof(struct cs42l56_private),

			       GFP_KERNEL);

	cs42l56 = devm_kzalloc(&i2c_client->dev, sizeof(*cs42l56), GFP_KERNEL);

	if (cs42l56 == NULL)

		return -ENOMEM;

	cs42l56->dev = &i2c_client->dev;
@@ -1207,14 +1205,11 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs42l56->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs42l56_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev,

				"could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			ret = cs42l56_handle_of_data(i2c_client,

						     &cs42l56->pdata);

sound/soc/codecs/cs42l73.c

+5 −8
Original line number Diff line number Diff line
@@ -1289,8 +1289,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 
	unsigned int reg;

	u32 val32;



	cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l73_private),

			       GFP_KERNEL);

	cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(*cs42l73), GFP_KERNEL);

	if (!cs42l73)

		return -ENOMEM;
@@ -1304,13 +1303,11 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, 
	if (pdata) {

		cs42l73->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev,

				     sizeof(struct cs42l73_platform_data),

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&i2c_client->dev, "could not allocate pdata\n");

		if (!pdata)

			return -ENOMEM;

		}



		if (i2c_client->dev.of_node) {

			if (of_property_read_u32(i2c_client->dev.of_node,

				"chgfreq", &val32) >= 0)

sound/soc/codecs/cs47l24.c

+3 −9
Original line number Diff line number Diff line
@@ -1120,9 +1120,11 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec) 
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);

	struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->core.arizona;

	int ret;



	priv->core.arizona->dapm = dapm;

	arizona->dapm = dapm;

	snd_soc_codec_init_regmap(codec, arizona->regmap);



	ret = arizona_init_spk(codec);

	if (ret < 0)
@@ -1175,17 +1177,9 @@ static unsigned int cs47l24_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_4L,

};



static struct regmap *cs47l24_get_regmap(struct device *dev)

{

	struct cs47l24_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_cs47l24 = {

	.probe = cs47l24_codec_probe,

	.remove = cs47l24_codec_remove,

	.get_regmap = cs47l24_get_regmap,



	.idle_bias_off = true,

sound/soc/codecs/cx20442.c

+14 −30
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 




struct cx20442_priv {

	void *control_data;

	struct tty_struct *tty;

	struct regulator *por;

};
@@ -88,17 +88,6 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = { 
	{"ADC", NULL, "Input Mixer"},

};



static unsigned int cx20442_read_reg_cache(struct snd_soc_codec *codec,

							unsigned int reg)

{

	u8 *reg_cache = codec->reg_cache;



	if (reg >= codec->driver->reg_cache_size)

		return -EINVAL;



	return reg_cache[reg];

}



enum v253_vls {

	V253_VLS_NONE = 0,

	V253_VLS_T,
@@ -123,6 +112,8 @@ enum v253_vls { 
	V253_VLS_TEST,

};



#if 0

/* FIXME : these function will be re-used */

static int cx20442_pm_to_v253_vls(u8 value)

{

	switch (value & ~(1 << CX20442_AGC)) {
@@ -163,9 +154,9 @@ static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg, 
	if (reg >= codec->driver->reg_cache_size)

		return -EINVAL;



	/* hw_write and control_data pointers required for talking to the modem

	/* tty and write pointers required for talking to the modem

	 * are expected to be set by the line discipline initialization code */

	if (!codec->hw_write || !cx20442->control_data)

	if (!cx20442->tty || !cx20442->tty->ops->write)

		return -EIO;



	old = reg_cache[reg];
@@ -194,12 +185,12 @@ static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg, 
		return -ENOMEM;



	dev_dbg(codec->dev, "%s: %s\n", __func__, buf);

	if (codec->hw_write(cx20442->control_data, buf, len) != len)

	if (cx20442->tty->ops->write(cx20442->tty, buf, len) != len)

		return -EIO;



	return 0;

}



#endif



/*

 * Line discpline related code
@@ -252,8 +243,7 @@ static void v253_close(struct tty_struct *tty) 
	cx20442 = snd_soc_codec_get_drvdata(codec);



	/* Prevent the codec driver from further accessing the modem */

	codec->hw_write = NULL;

	cx20442->control_data = NULL;

	cx20442->tty = NULL;

	codec->component.card->pop_time = 0;

}
@@ -276,12 +266,11 @@ static void v253_receive(struct tty_struct *tty, 


	cx20442 = snd_soc_codec_get_drvdata(codec);



	if (!cx20442->control_data) {

	if (!cx20442->tty) {

		/* First modem response, complete setup procedure */



		/* Set up codec driver access to modem controls */

		cx20442->control_data = tty;

		codec->hw_write = (hw_write_t)tty->ops->write;

		cx20442->tty = tty;

		codec->component.card->pop_time = 1;

	}

}
@@ -367,10 +356,9 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec) 
	cx20442->por = regulator_get(codec->dev, "POR");

	if (IS_ERR(cx20442->por))

		dev_warn(codec->dev, "failed to get the regulator");

	cx20442->control_data = NULL;

	cx20442->tty = NULL;



	snd_soc_codec_set_drvdata(codec, cx20442);

	codec->hw_write = NULL;

	codec->component.card->pop_time = 0;



	return 0;
@@ -381,8 +369,8 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) 
{

	struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);



	if (cx20442->control_data) {

		struct tty_struct *tty = cx20442->control_data;

	if (cx20442->tty) {

		struct tty_struct *tty = cx20442->tty;

		tty_hangup(tty);

	}
@@ -402,11 +390,7 @@ static const struct snd_soc_codec_driver cx20442_codec_dev = { 
	.probe = 	cx20442_codec_probe,

	.remove = 	cx20442_codec_remove,

	.set_bias_level = cx20442_set_bias_level,

	.reg_cache_default = &cx20442_reg,

	.reg_cache_size = 1,

	.reg_word_size = sizeof(u8),

	.read = cx20442_read_reg_cache,

	.write = cx20442_write,



	.component_driver = {

		.dapm_widgets		= cx20442_dapm_widgets,

		.num_dapm_widgets	= ARRAY_SIZE(cx20442_dapm_widgets),

sound/soc/codecs/da7213.c

+2 −5
Original line number Diff line number Diff line
@@ -1654,10 +1654,8 @@ static struct da7213_platform_data 
	u32 fw_val32;



	pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata) {

		dev_warn(codec->dev, "Failed to allocate memory for pdata\n");

	if (!pdata)

		return NULL;

	}



	if (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0)

		pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);
@@ -1855,8 +1853,7 @@ static int da7213_i2c_probe(struct i2c_client *i2c, 
	struct da7213_priv *da7213;

	int ret;



	da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv),

			      GFP_KERNEL);

	da7213 = devm_kzalloc(&i2c->dev, sizeof(*da7213), GFP_KERNEL);

	if (!da7213)

		return -ENOMEM;