From: Mark Brown <broonie@linaro.org>
Date: Wed, 12 Mar 2014 23:04:52 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic26... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ba67761c1a00636a9d1c97db45ce5c2f87299f18;p=deliverable%2Flinux.git

Merge remote-tracking branches 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic26', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda1380', 'asoc/topic/wl1273' and 'asoc/topic/wm2200' into asoc-next
---

ba67761c1a00636a9d1c97db45ce5c2f87299f18
diff --cc sound/soc/codecs/Makefile
index a906ef458c8f,ed1fd8925e43,bc126764a44d,1deeb20fd411,bc126764a44d,bc126764a44d,bc126764a44d,bc126764a44d,bc126764a44d,bc126764a44d,bc126764a44d..cb46c4c78dc2
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@@@@@@ -76,11 -63,11 -63,9 -63,9 -63,9 -63,9 -63,9 -63,9 -63,9 -63,9 -63,9 +76,11 @@@@@@@@@@@@ snd-soc-sta529-objs := sta529.
           snd-soc-stac9766-objs := stac9766.o
           snd-soc-tas5086-objs := tas5086.o
           snd-soc-tlv320aic23-objs := tlv320aic23.o
  +++++++++snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
  +++++++++snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
           snd-soc-tlv320aic26-objs := tlv320aic26.o
--- -------snd-soc-tlv320aic3x-objs := tlv320aic3x.o
           snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
+++ +++++++snd-soc-tlv320aic3x-objs := tlv320aic3x.o
           snd-soc-tlv320dac33-objs := tlv320dac33.o
           snd-soc-twl4030-objs := twl4030.o
           snd-soc-twl6040-objs := twl6040.o
@@@@@@@@@@@@ -220,11 -195,11 -193,9 -193,9 -193,9 -193,9 -193,9 -193,9 -193,9 -193,9 -193,9 +220,11 @@@@@@@@@@@@ obj-$(CONFIG_SND_SOC_STA529)   += snd-s
           obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o
           obj-$(CONFIG_SND_SOC_TAS5086)	+= snd-soc-tas5086.o
           obj-$(CONFIG_SND_SOC_TLV320AIC23)	+= snd-soc-tlv320aic23.o
  +++++++++obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)	+= snd-soc-tlv320aic23-i2c.o
  +++++++++obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o
           obj-$(CONFIG_SND_SOC_TLV320AIC26)	+= snd-soc-tlv320aic26.o
--- -------obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
           obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o
+++ +++++++obj-$(CONFIG_SND_SOC_TLV320AIC3X)	+= snd-soc-tlv320aic3x.o
           obj-$(CONFIG_SND_SOC_TLV320DAC33)	+= snd-soc-tlv320dac33.o
           obj-$(CONFIG_SND_SOC_TWL4030)	+= snd-soc-twl4030.o
           obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o
diff --cc sound/soc/codecs/tlv320aic23.c
index 27261e4b27c7,7b4cfef232ea,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51,5d430cc56f51..dc9a52fcb39a
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@@@@@@@@@@@ -627,13 -628,14 -634,39 -634,39 -634,39 -634,39 -634,39 -634,39 -634,39 -634,39 -634,39 +628,14 @@@@@@@@@@@@ int tlv320aic23_probe(struct device *de
           	if (aic23 == NULL)
           		return -ENOMEM;
           
  ---------	aic23->regmap = devm_regmap_init_i2c(i2c, &tlv320aic23_regmap);
  ---------	if (IS_ERR(aic23->regmap))
  ---------		return PTR_ERR(aic23->regmap);
  +++++++++	aic23->regmap = regmap;
           
  ---------	i2c_set_clientdata(i2c, aic23);
  +++++++++	dev_set_drvdata(dev, aic23);
           
  ---------	ret =  snd_soc_register_codec(&i2c->dev,
  ---------			&soc_codec_dev_tlv320aic23, &tlv320aic23_dai, 1);
  ---------	return ret;
  ---------}
  ---------static int __exit tlv320aic23_i2c_remove(struct i2c_client *i2c)
  ---------{
  ---------	snd_soc_unregister_codec(&i2c->dev);
  ---------	return 0;
  +++++++++	return snd_soc_register_codec(dev, &soc_codec_dev_tlv320aic23,
  +++++++++				      &tlv320aic23_dai, 1);
           }
  ---------
  ---------static const struct i2c_device_id tlv320aic23_id[] = {
  ---------	{"tlv320aic23", 0},
  ---------	{}
  ---------};
  ---------
  ---------MODULE_DEVICE_TABLE(i2c, tlv320aic23_id);
  ---------
  ---------static struct i2c_driver tlv320aic23_i2c_driver = {
  ---------	.driver = {
  ---------		   .name = "tlv320aic23-codec",
  ---------		   },
  ---------	.probe = tlv320aic23_codec_probe,
  ---------	.remove = __exit_p(tlv320aic23_i2c_remove),
  ---------	.id_table = tlv320aic23_id,
  ---------};
  ---------
  ---------module_i2c_driver(tlv320aic23_i2c_driver);
+ +++++++++EXPORT_SYMBOL(tlv320aic23_probe);
           
           MODULE_DESCRIPTION("ASoC TLV320AIC23 codec driver");
           MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");