From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Dec 2014 13:12:02 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/max98088', 'asoc/topic/max98090', 'asoc... 
X-Git-Tag: firefly_0821_release~176^2~2610^2~38^2~15
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=41967b775e14a123131a842edd46f284e3642816;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branches 'asoc/topic/max98088', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max9850' and 'asoc/topic/mop500' into asoc-next
---

41967b775e14a123131a842edd46f284e3642816
diff --cc sound/soc/codecs/max98090.c
index 34ed9a91f392,d519294f57c7,2ad381c4ec57,d519294f57c7,d519294f57c7,d519294f57c7..151f718241ea
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@@@@ -1943,15 -1941,15 -2049,18 -1941,15 -1941,15 -1941,15 +2051,18 @@@@@@@ static int max98090_dai_set_sysclk(stru
      	 *		 0x02 (when master clk is 20MHz to 40MHz)..
      	 *		 0x03 (when master clk is 40MHz to 60MHz)..
      	 */
 - ---	if ((freq >= 10000000) && (freq < 20000000)) {
 + +++	if ((freq >= 10000000) && (freq <= 20000000)) {
      		snd_soc_write(codec, M98090_REG_SYSTEM_CLOCK,
      			M98090_PSCLK_DIV1);
 - ---	} else if ((freq >= 20000000) && (freq < 40000000)) {
++ +++		max98090->pclk = freq;
 + +++	} else if ((freq > 20000000) && (freq <= 40000000)) {
      		snd_soc_write(codec, M98090_REG_SYSTEM_CLOCK,
      			M98090_PSCLK_DIV2);
 - ---	} else if ((freq >= 40000000) && (freq < 60000000)) {
++ +++		max98090->pclk = freq >> 1;
 + +++	} else if ((freq > 40000000) && (freq <= 60000000)) {
      		snd_soc_write(codec, M98090_REG_SYSTEM_CLOCK,
      			M98090_PSCLK_DIV4);
++ +++		max98090->pclk = freq >> 2;
      	} else {
      		dev_err(codec->dev, "Invalid master clock frequency\n");
      		return -EINVAL;