Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc...

[karo-tx-linux.git] / sound / soc / codecs / max98090.h

diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 1a4e2334a7b21d6f581a5cf371ffe6964563f6f2..cf1b6062ba8c6de043fa2ffb46834119e858f936 100644 (file)
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h
@@ -1524,6 +1524,7 @@ struct max98090_priv {
        struct snd_soc_codec *codec;
        enum max98090_type devtype;
        struct max98090_pdata *pdata;
+       struct clk *mclk;
        unsigned int sysclk;
        unsigned int bclk;
        unsigned int lrclk;
@@ -1540,6 +1541,7 @@ struct max98090_priv {
        unsigned int pa2en;
        unsigned int extmic_mux;
        unsigned int sidetone;
+       bool master;
 };
 
 int max98090_mic_detect(struct snd_soc_codec *codec,