From: Mark Brown <broonie@kernel.org>
Date: Wed, 28 Mar 2018 02:31:58 +0000 (+0800)
Subject: Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712', 'asoc/topic... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=38a72a9f86302e60c2b54fe00ea1700767434f6f;p=openwrt%2Fstaging%2Fblogic.git

Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/wm_adsp' into asoc-next
---

38a72a9f86302e60c2b54fe00ea1700767434f6f
diff --cc sound/soc/codecs/wm_adsp.h
index 82d651ff9d73,41cc11c19b83,41cc11c19b83,41cc11c19b83,d4042c95315e..bc6d359f0533
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@@@@@ -62,12 -62,12 -62,12 -62,12 -62,12 +62,12 @@@@@@ struct wm_adsp 
     	int type;
     	struct device *dev;
     	struct regmap *regmap;
 ----	struct snd_soc_codec *codec;
 ++++	struct snd_soc_component *component;
     
---- 	int base;
---- 	int sysclk_reg;
---- 	int sysclk_mask;
---- 	int sysclk_shift;
++++ 	unsigned int base;
++++ 	unsigned int sysclk_reg;
++++ 	unsigned int sysclk_mask;
++++ 	unsigned int sysclk_shift;
     
     	struct list_head alg_regions;