Merge tag 'trace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / mfd / madera-core.c

diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 4ed6ad8..a2abc00 100644 (file)
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -38,6 +38,9 @@
 #define MADERA_RESET_MIN_US    2000
 #define MADERA_RESET_MAX_US    3000
 
+#define ERRATA_DCVDD_MIN_US    10000
+#define ERRATA_DCVDD_MAX_US    15000
+
 static const char * const madera_core_supplies[] = {
        "AVDD",
        "DBVDD1",
@@ -291,6 +294,9 @@ static int __maybe_unused madera_runtime_resume(struct device *dev)
 
        dev_dbg(dev, "Leaving sleep mode\n");
 
+       if (!madera->reset_errata)
+               madera_enable_hard_reset(madera);
+
        ret = regulator_enable(madera->dcvdd);
        if (ret) {
                dev_err(dev, "Failed to enable DCVDD: %d\n", ret);
@@ -300,7 +306,22 @@ static int __maybe_unused madera_runtime_resume(struct device *dev)
        regcache_cache_only(madera->regmap, false);
        regcache_cache_only(madera->regmap_32bit, false);
 
-       usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US);
+       if (madera->reset_errata)
+               usleep_range(ERRATA_DCVDD_MIN_US, ERRATA_DCVDD_MAX_US);
+       else
+               madera_disable_hard_reset(madera);
+
+       if (!madera->pdata.reset || madera->reset_errata) {
+               ret = madera_wait_for_boot(madera);
+               if (ret)
+                       goto err;
+
+               ret = madera_soft_reset(madera);
+               if (ret) {
+                       dev_err(dev, "Failed to reset: %d\n", ret);
+                       goto err;
+               }
+       }
 
        ret = madera_wait_for_boot(madera);
        if (ret)
@@ -489,6 +510,8 @@ int madera_dev_init(struct madera *madera)
         */
        switch (madera->type) {
        case CS47L15:
+               madera->reset_errata = true;
+               break;
        case CS47L35:
        case CS47L90:
        case CS47L91:
@@ -539,13 +562,19 @@ int madera_dev_init(struct madera *madera)
                goto err_dcvdd;
        }
 
+       if (madera->reset_errata)
+               madera_disable_hard_reset(madera);
+
        ret = regulator_enable(madera->dcvdd);
        if (ret) {
                dev_err(dev, "Failed to enable DCVDD: %d\n", ret);
                goto err_enable;
        }
 
-       madera_disable_hard_reset(madera);
+       if (madera->reset_errata)
+               usleep_range(ERRATA_DCVDD_MIN_US, ERRATA_DCVDD_MAX_US);
+       else
+               madera_disable_hard_reset(madera);
 
        regcache_cache_only(madera->regmap, false);
        regcache_cache_only(madera->regmap_32bit, false);
@@ -653,7 +682,7 @@ int madera_dev_init(struct madera *madera)
         * It looks like a device we support. If we don't have a hard reset
         * we can now attempt a soft reset.
         */
-       if (!madera->pdata.reset) {
+       if (!madera->pdata.reset || madera->reset_errata) {
                ret = madera_soft_reset(madera);
                if (ret)
                        goto err_reset;