From: Mark Brown <broonie@kernel.org>
Date: Wed, 28 Mar 2018 02:29:01 +0000 (+0800)
Subject: Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic... 
X-Git-Tag: v4.17-rc1~119^2~1^2~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=53ccd1aa83f59e966e0d332a161eaa6f581139af;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/bd28623', 'asoc/topic/blackfin' and 'asoc/topic/bt-sco' into asoc-next
---

53ccd1aa83f59e966e0d332a161eaa6f581139af
diff --cc sound/soc/atmel/atmel-classd.c
index 6bc2b729495c,6bc2b729495c,709a13221d79,ebabed69f0e6,6bc2b729495c,ebabed69f0e6..3d70061901a0
--- a/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/codecs/Makefile
index bc5eff111337,da1571336f1e,da1571336f1e,6df2fb32fc7e,da1571336f1e,da1571336f1e..c1647babc749
--- a/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