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

Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm0010',... 

Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm0010', 'asoc/topic/wm2000', 'asoc/topic/wm5102' and 'asoc/topic/wm5110' into asoc-next
parents 3cad9eda 1783c9d7 316c85c3 bf0842ba 2d6e28c3 893d7cbe

sound/soc/codecs/wm0010.c

+1 −4
Original line number Diff line number Diff line
@@ -655,11 +655,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		ret = -ENOMEM;

		len = pll_rec.length + 8;

		out = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!out) {

			dev_err(codec->dev,

				"Failed to allocate RX buffer\n");

		if (!out)

			goto abort;

		}



		img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!img_swap)

sound/soc/codecs/wm2000.c

+2 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * 'wm2000_anc.bin' by default (overridable via platform data) at

 * runtime and is expected to be in flat binary format.  This is

 * generated by Wolfson configuration tools and includes

 * system-specific callibration information.  If supplied as a

 * system-specific calibration information.  If supplied as a

 * sequence of ASCII-encoded hexidecimal bytes this can be converted

 * into a flat binary with a command such as this on the command line:

 *
@@ -826,8 +826,7 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, 
	int reg;

	u16 id;



	wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),

			      GFP_KERNEL);

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

	if (!wm2000)

		return -ENOMEM;
@@ -902,7 +901,6 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, 
					    wm2000->anc_download_size,

					    GFP_KERNEL);

	if (wm2000->anc_download == NULL) {

		dev_err(&i2c->dev, "Out of memory\n");

		ret = -ENOMEM;

		goto err_supplies;

	}

sound/soc/codecs/wm5102.c

+3 −8
Original line number Diff line number Diff line
@@ -1935,8 +1935,11 @@ static int wm5102_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 wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);

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

	int ret;



	snd_soc_codec_init_regmap(codec, arizona->regmap);



	ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);

	if (ret)

		return ret;
@@ -1989,17 +1992,9 @@ static unsigned int wm5102_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_5R,

};



static struct regmap *wm5102_get_regmap(struct device *dev)

{

	struct wm5102_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm5102 = {

	.probe = wm5102_codec_probe,

	.remove = wm5102_codec_remove,

	.get_regmap = wm5102_get_regmap,



	.idle_bias_off = true,

sound/soc/codecs/wm5110.c

+3 −9
Original line number Diff line number Diff line
@@ -2280,9 +2280,11 @@ static int wm5110_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 wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);

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

	int i, 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)
@@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_6R,

};



static struct regmap *wm5110_get_regmap(struct device *dev)

{

	struct wm5110_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {

	.probe = wm5110_codec_probe,

	.remove = wm5110_codec_remove,

	.get_regmap = wm5110_get_regmap,



	.idle_bias_off = true,

sound/soc/ux500/mop500.c

+4 −0
Original line number Diff line number Diff line
@@ -163,3 +163,7 @@ static struct platform_driver snd_soc_mop500_driver = { 
};



module_platform_driver(snd_soc_mop500_driver);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("ASoC MOP500 board driver");

MODULE_AUTHOR("Ola Lilja");