soc: mediatek: SCPSYS: Fix double enabling of regulators

[karo-tx-linux.git] / drivers / soc / mediatek / mtk-scpsys.c

diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index 4d4203c896c40e71486dd27e60e0918071c1e0ae..57e781c71e6776223b7f13fecaa3243572302cf7 100644 (file)
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -15,12 +15,13 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <linux/regmap.h>
 #include <linux/soc/mediatek/infracfg.h>
+#include <linux/regulator/consumer.h>
 #include <dt-bindings/power/mt8173-power.h>
 
 #define SPM_VDE_PWR_CON                        0x0210
@@ -75,7 +76,7 @@ struct scp_domain_data {
        bool active_wakeup;
 };
 
-static const struct scp_domain_data scp_domain_data[] __initconst = {
+static const struct scp_domain_data scp_domain_data[] = {
        [MT8173_POWER_DOMAIN_VDEC] = {
                .name = "vdec",
                .sta_mask = PWR_STATUS_VDEC,
@@ -173,12 +174,8 @@ struct scp_domain {
        struct generic_pm_domain genpd;
        struct scp *scp;
        struct clk *clk[MAX_CLKS];
-       u32 sta_mask;
-       void __iomem *ctl_addr;
-       u32 sram_pdn_bits;
-       u32 sram_pdn_ack_bits;
-       u32 bus_prot_mask;
-       bool active_wakeup;
+       const struct scp_domain_data *data;
+       struct regulator *supply;
 };
 
 struct scp {
@@ -193,8 +190,9 @@ static int scpsys_domain_is_on(struct scp_domain *scpd)
 {
        struct scp *scp = scpd->scp;
 
-       u32 status = readl(scp->base + SPM_PWR_STATUS) & scpd->sta_mask;
-       u32 status2 = readl(scp->base + SPM_PWR_STATUS_2ND) & scpd->sta_mask;
+       u32 status = readl(scp->base + SPM_PWR_STATUS) & scpd->data->sta_mask;
+       u32 status2 = readl(scp->base + SPM_PWR_STATUS_2ND) &
+                               scpd->data->sta_mask;
 
        /*
         * A domain is on when both status bits are set. If only one is set
@@ -215,12 +213,18 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
        struct scp *scp = scpd->scp;
        unsigned long timeout;
        bool expired;
-       void __iomem *ctl_addr = scpd->ctl_addr;
-       u32 sram_pdn_ack = scpd->sram_pdn_ack_bits;
+       void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs;
+       u32 sram_pdn_ack = scpd->data->sram_pdn_ack_bits;
        u32 val;
        int ret;
        int i;
 
+       if (scpd->supply) {
+               ret = regulator_enable(scpd->supply);
+               if (ret)
+                       return ret;
+       }
+
        for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++) {
                ret = clk_prepare_enable(scpd->clk[i]);
                if (ret) {
@@ -265,7 +269,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
        val |= PWR_RST_B_BIT;
        writel(val, ctl_addr);
 
-       val &= ~scpd->sram_pdn_bits;
+       val &= ~scpd->data->sram_pdn_bits;
        writel(val, ctl_addr);
 
        /* wait until SRAM_PDN_ACK all 0 */
@@ -284,9 +288,9 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
                        expired = true;
        }
 
-       if (scpd->bus_prot_mask) {
+       if (scpd->data->bus_prot_mask) {
                ret = mtk_infracfg_clear_bus_protection(scp->infracfg,
-                               scpd->bus_prot_mask);
+                               scpd->data->bus_prot_mask);
                if (ret)
                        goto err_pwr_ack;
        }
@@ -299,6 +303,9 @@ err_pwr_ack:
                        clk_disable_unprepare(scpd->clk[i]);
        }
 err_clk:
+       if (scpd->supply)
+               regulator_disable(scpd->supply);
+
        dev_err(scp->dev, "Failed to power on domain %s\n", genpd->name);
 
        return ret;
@@ -310,21 +317,21 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
        struct scp *scp = scpd->scp;
        unsigned long timeout;
        bool expired;
-       void __iomem *ctl_addr = scpd->ctl_addr;
-       u32 pdn_ack = scpd->sram_pdn_ack_bits;
+       void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs;
+       u32 pdn_ack = scpd->data->sram_pdn_ack_bits;
        u32 val;
        int ret;
        int i;
 
-       if (scpd->bus_prot_mask) {
+       if (scpd->data->bus_prot_mask) {
                ret = mtk_infracfg_set_bus_protection(scp->infracfg,
-                               scpd->bus_prot_mask);
+                               scpd->data->bus_prot_mask);
                if (ret)
                        goto out;
        }
 
        val = readl(ctl_addr);
-       val |= scpd->sram_pdn_bits;
+       val |= scpd->data->sram_pdn_bits;
        writel(val, ctl_addr);
 
        /* wait until SRAM_PDN_ACK all 1 */
@@ -379,6 +386,9 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
        for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++)
                clk_disable_unprepare(scpd->clk[i]);
 
+       if (scpd->supply)
+               regulator_disable(scpd->supply);
+
        return 0;
 
 out:
@@ -395,10 +405,10 @@ static bool scpsys_active_wakeup(struct device *dev)
        genpd = pd_to_genpd(dev->pm_domain);
        scpd = container_of(genpd, struct scp_domain, genpd);
 
-       return scpd->active_wakeup;
+       return scpd->data->active_wakeup;
 }
 
-static int __init scpsys_probe(struct platform_device *pdev)
+static int scpsys_probe(struct platform_device *pdev)
 {
        struct genpd_onecell_data *pd_data;
        struct resource *res;
@@ -448,6 +458,19 @@ static int __init scpsys_probe(struct platform_device *pdev)
                return PTR_ERR(scp->infracfg);
        }
 
+       for (i = 0; i < NUM_DOMAINS; i++) {
+               struct scp_domain *scpd = &scp->domains[i];
+               const struct scp_domain_data *data = &scp_domain_data[i];
+
+               scpd->supply = devm_regulator_get_optional(&pdev->dev, data->name);
+               if (IS_ERR(scpd->supply)) {
+                       if (PTR_ERR(scpd->supply) == -ENODEV)
+                               scpd->supply = NULL;
+                       else
+                               return PTR_ERR(scpd->supply);
+               }
+       }
+
        pd_data->num_domains = NUM_DOMAINS;
 
        for (i = 0; i < NUM_DOMAINS; i++) {
@@ -458,12 +481,7 @@ static int __init scpsys_probe(struct platform_device *pdev)
                pd_data->domains[i] = genpd;
                scpd->scp = scp;
 
-               scpd->sta_mask = data->sta_mask;
-               scpd->ctl_addr = scp->base + data->ctl_offs;
-               scpd->sram_pdn_bits = data->sram_pdn_bits;
-               scpd->sram_pdn_ack_bits = data->sram_pdn_ack_bits;
-               scpd->bus_prot_mask = data->bus_prot_mask;
-               scpd->active_wakeup = data->active_wakeup;
+               scpd->data = data;
                for (j = 0; j < MAX_CLKS && data->clk_id[j]; j++)
                        scpd->clk[j] = clk[data->clk_id[j]];
 
@@ -473,14 +491,13 @@ static int __init scpsys_probe(struct platform_device *pdev)
                genpd->dev_ops.active_wakeup = scpsys_active_wakeup;
 
                /*
-                * Initially turn on all domains to make the domains usable
-                * with !CONFIG_PM and to get the hardware in sync with the
-                * software.  The unused domains will be switched off during
-                * late_init time.
+                * With CONFIG_PM disabled turn on all domains to make the
+                * hardware usable.
                 */
-               genpd->power_on(genpd);
+               if (!IS_ENABLED(CONFIG_PM))
+                       genpd->power_on(genpd);
 
-               pm_genpd_init(genpd, NULL, false);
+               pm_genpd_init(genpd, NULL, true);
        }
 
        /*
@@ -515,11 +532,12 @@ static const struct of_device_id of_scpsys_match_tbl[] = {
 };
 
 static struct platform_driver scpsys_drv = {
+       .probe = scpsys_probe,
        .driver = {
                .name = "mtk-scpsys",
+               .suppress_bind_attrs = true,
                .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(of_scpsys_match_tbl),
        },
 };
-
-module_platform_driver_probe(scpsys_drv, scpsys_probe);
+builtin_platform_driver(scpsys_drv);