[PATCH RESEND v4 3/3] mfd: madera: Add support for requesting the supply clocks

[Charles Keepax]

Add the ability to get the clock for each clock input pin of the chip
and enable MCLK2 since that is expected to be a permanently enabled
32kHz clock.

Signed-off-by: Charles Keepax <ckee...@opensource.cirrus.com>
---
 drivers/mfd/madera-core.c       | 27 ++++++++++++++++++++++++++-
 include/linux/mfd/madera/core.h | 11 +++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 29540cbf75934..a8cfadc1fc01e 100644
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -450,6 +450,21 @@ int madera_dev_init(struct madera *madera)
                       sizeof(madera->pdata));
        }
 
+       madera->mclk[MADERA_MCLK1].id = "mclk1";
+       madera->mclk[MADERA_MCLK2].id = "mclk2";
+       madera->mclk[MADERA_MCLK3].id = "mclk3";
+
+       ret = devm_clk_bulk_get_optional(madera->dev, ARRAY_SIZE(madera->mclk),
+                                        madera->mclk);
+       if (ret) {
+               dev_err(madera->dev, "Failed to get clocks: %d\n", ret);
+               return ret;
+       }
+
+       /* Not using devm_clk_get to prevent breakage of existing DTs */
+       if (!madera->mclk[MADERA_MCLK2].clk)
+               dev_warn(madera->dev, "Missing MCLK2, requires 32kHz clock\n");
+
        ret = madera_get_reset_gpio(madera);
        if (ret)
                return ret;
@@ -660,13 +675,19 @@ int madera_dev_init(struct madera *madera)
        }
 
        /* Init 32k clock sourced from MCLK2 */
+       ret = clk_prepare_enable(madera->mclk[MADERA_MCLK2].clk);
+       if (ret) {
+               dev_err(madera->dev, "Failed to enable 32k clock: %d\n", ret);
+               goto err_reset;
+       }
+
        ret = regmap_update_bits(madera->regmap,
                        MADERA_CLOCK_32K_1,
                        MADERA_CLK_32K_ENA_MASK | MADERA_CLK_32K_SRC_MASK,
                        MADERA_CLK_32K_ENA | MADERA_32KZ_MCLK2);
        if (ret) {
                dev_err(madera->dev, "Failed to init 32k clock: %d\n", ret);
-               goto err_reset;
+               goto err_clock;
        }
 
        pm_runtime_set_active(madera->dev);
@@ -687,6 +708,8 @@ int madera_dev_init(struct madera *madera)
 
 err_pm_runtime:
        pm_runtime_disable(madera->dev);
+err_clock:
+       clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk);
 err_reset:
        madera_enable_hard_reset(madera);
        regulator_disable(madera->dcvdd);
@@ -713,6 +736,8 @@ int madera_dev_exit(struct madera *madera)
         */
        pm_runtime_disable(madera->dev);
 
+       clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk);
+
        regulator_disable(madera->dcvdd);
        regulator_put(madera->dcvdd);
 
diff --git a/include/linux/mfd/madera/core.h b/include/linux/mfd/madera/core.h
index 7ffa696cce7ca..ad2c138105d4b 100644
--- a/include/linux/mfd/madera/core.h
+++ b/include/linux/mfd/madera/core.h
@@ -8,6 +8,7 @@
 #ifndef MADERA_CORE_H
 #define MADERA_CORE_H
 
+#include <linux/clk.h>
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/madera/pdata.h>
@@ -29,6 +30,13 @@ enum madera_type {
        CS42L92 = 9,
 };
 
+enum {
+       MADERA_MCLK1,
+       MADERA_MCLK2,
+       MADERA_MCLK3,
+       MADERA_NUM_MCLK
+};
+
 #define MADERA_MAX_CORE_SUPPLIES       2
 #define MADERA_MAX_GPIOS               40
 
@@ -155,6 +163,7 @@ struct snd_soc_dapm_context;
  * @irq_dev:           the irqchip child driver device
  * @irq_data:          pointer to irqchip data for the child irqchip driver
  * @irq:               host irq number from SPI or I2C configuration
+ * @mclk:              Structure holding clock supplies
  * @out_clamp:         indicates output clamp state for each analogue output
  * @out_shorted:       indicates short circuit state for each analogue output
  * @hp_ena:            bitflags of enable state for the headphone outputs
@@ -184,6 +193,8 @@ struct madera {
        struct regmap_irq_chip_data *irq_data;
        int irq;
 
+       struct clk_bulk_data mclk[MADERA_NUM_MCLK];
+
        unsigned int num_micbias;
        unsigned int num_childbias[MADERA_MAX_MICBIAS];
 
-- 
2.11.0