Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic...

diff --cc MAINTAINERS
Simple merge

diff --cc sound/soc/atmel/atmel-classd.c
index 6bc2b729495c191895e7b84f59ca8624dedc31f5,6bc2b729495c191895e7b84f59ca8624dedc31f5,709a13221d79d36d52052b484e1a713e6fead891,ebabed69f0e67d3c74bffdfee4726acb8044c51f,6bc2b729495c191895e7b84f59ca8624dedc31f5,ebabed69f0e67d3c74bffdfee4726acb8044c51f..3d70061901a0795018ce4bc8dcf9a85dae7e0c2b
--- 1/sound/soc/atmel/atmel-classd.c
--- 2/sound/soc/atmel/atmel-classd.c
--- 3/sound/soc/atmel/atmel-classd.c
--- 4/sound/soc/atmel/atmel-classd.c
--- 5/sound/soc/atmel/atmel-classd.c
--- 6/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@@@@@@ -581,14 -581,14 -582,10 -580,13 -581,14 -580,13 +583,11 @@@@@@@ static int atmel_classd_probe(struct pl
      
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        io_base = devm_ioremap_resource(dev, res);
-- ---  if (IS_ERR(io_base)) {
-- ---          ret =  PTR_ERR(io_base);
-- ---          dev_err(dev, "failed to remap register memory: %d\n", ret);
-- ---          return ret;
-- ---  }
++ +++  if (IS_ERR(io_base))
++ +++          return PTR_ERR(io_base);
      
        dd->phy_base = res->start;
  ++ +  dd->dev = dev;
      
        dd->regmap = devm_regmap_init_mmio(dev, io_base,
                                        &atmel_classd_regmap_config);

diff --cc sound/soc/atmel/atmel-pdmic.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
index bc5eff11133796aa066dff2b33ccbd6b7ce5c10b,da1571336f1e83a431c5a301b7c22e4ce12758a2,da1571336f1e83a431c5a301b7c22e4ce12758a2,6df2fb32fc7e9f9e4109daa2ba9eca536e8a30a4,da1571336f1e83a431c5a301b7c22e4ce12758a2,da1571336f1e83a431c5a301b7c22e4ce12758a2..c1647babc74959482130e9d9f565085217f59abd
--- 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
+++ b/sound/soc/codecs/Makefile
@@@@@@@ -35,8 -34,7 -34,7 -34,8 -34,7 -34,7 +35,9 @@@@@@@ snd-soc-ak4641-objs := ak4641.
      snd-soc-ak4642-objs := ak4642.o
      snd-soc-ak4671-objs := ak4671.o
      snd-soc-ak5386-objs := ak5386.o
 +++++snd-soc-ak5558-objs := ak5558.o
      snd-soc-arizona-objs := arizona.o
+++ ++snd-soc-bd28623-objs := bd28623.o
      snd-soc-bt-sco-objs := bt-sco.o
      snd-soc-cq93vc-objs := cq93vc.o
      snd-soc-cs35l32-objs := cs35l32.o

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

diff --cc sound/soc/samsung/tm2_wm5110.c
Simple merge