2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index dda86293dc9f..c2088f4c4547 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -282,6 +282,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                 /* Default PLL configuration after power up */
                 twl6040->pll = TWL6040_SYSCLK_SEL_LPPLL;
                 twl6040->sysclk = 19200000;
+                twl6040->mclk = 32768;
         } else {
                 /* already powered-down */
                 if (!twl6040->power_count) {
@@ -305,6 +306,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                         twl6040_power_down(twl6040);
                 }
                 twl6040->sysclk = 0;
+                twl6040->mclk = 0;
         }
 
 out:
@@ -421,6 +423,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         }
 
         twl6040->sysclk = freq_out;
+        twl6040->mclk = freq_in;
         twl6040->pll = pll_id;
 
 pll_out:
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 2463c2619596..9bc9ac651dad 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -187,8 +187,10 @@ struct twl6040 {
         int rev;
         u8 vibra_ctrl_cache[2];
 
+        /* PLL configuration */
         int pll;
         unsigned int sysclk;
+        unsigned int mclk;
 
         unsigned int irq;
         unsigned int irq_base;