Merge remote-tracking branches 'asoc/topic/max98088', 'asoc/topic/max98090', 'asoc...

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

diff --cc sound/soc/codecs/max98090.c
index 34ed9a91f3926f4b4ba01aebf53b01b4ee282213,d519294f57c79c289784f9a71bb43d7bf51dc7e9,2ad381c4ec5795634d1722998bcd4c5f11a7aaf5,d519294f57c79c289784f9a71bb43d7bf51dc7e9,d519294f57c79c289784f9a71bb43d7bf51dc7e9,d519294f57c79c289784f9a71bb43d7bf51dc7e9..151f718241ea4359c25b0703b44bf74c5e7164d1
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
--- 3/sound/soc/codecs/max98090.c
--- 4/sound/soc/codecs/max98090.c
--- 5/sound/soc/codecs/max98090.c
--- 6/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;

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