Merge remote-tracking branches 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic26...

diff --cc sound/soc/codecs/Makefile
index a906ef458c8f610f18d593369298d0cfd06ea8a6,ed1fd8925e43985e368ef6138104e93fc4085578,bc126764a44d02cb38b50f3ae74900a9ce490da2,1deeb20fd41100c5275eada455537276570b75c7,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2..cb46c4c78dc20496c96c59c2426856d052e5e778
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
--- 5/sound/soc/codecs/Makefile
--- 6/sound/soc/codecs/Makefile
--- 7/sound/soc/codecs/Makefile
--- 8/sound/soc/codecs/Makefile
--- 9/sound/soc/codecs/Makefile
--- 10/sound/soc/codecs/Makefile
--- 11/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/cs42l51.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic23.c
index 27261e4b27c788fd1232388366def9c9abe91bca,7b4cfef232ea71b6551332b8ff4af1a8f9e48dea,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae,5d430cc56f51d42397c3190bf3bfb55b7f850dae..dc9a52fcb39ae248c5ad1169aa38c82e183c1132
--- 1/sound/soc/codecs/tlv320aic23.c
--- 2/sound/soc/codecs/tlv320aic23.c
--- 3/sound/soc/codecs/tlv320aic23.c
--- 4/sound/soc/codecs/tlv320aic23.c
--- 5/sound/soc/codecs/tlv320aic23.c
--- 6/sound/soc/codecs/tlv320aic23.c
--- 7/sound/soc/codecs/tlv320aic23.c
--- 8/sound/soc/codecs/tlv320aic23.c
--- 9/sound/soc/codecs/tlv320aic23.c
--- 10/sound/soc/codecs/tlv320aic23.c
--- 11/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>");

diff --cc sound/soc/codecs/tlv320dac33.c
Simple merge

diff --cc sound/soc/codecs/twl4030.c
Simple merge

diff --cc sound/soc/codecs/uda1380.c
Simple merge

diff --cc sound/soc/codecs/wl1273.c
Simple merge