From: Weiyi Lu <weiyi.lu@mediatek.com>
To: Nicolas Boichat <drinkcat@chromium.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Herring <robh@kernel.org>
Cc: James Liao <jamesjj.liao@mediatek.com>,
Weiyi Lu <weiyi.lu@mediatek.com>,
srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org,
Fan Chen <fan.chen@mediatek.com>,
linux-mediatek@lists.infradead.org,
Yong Wu <yong.wu@mediatek.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 06/14] soc: mediatek: Refactor clock control
Date: Thu, 20 Jun 2019 10:37:58 +0800 [thread overview]
Message-ID: <1560998286-9189-7-git-send-email-weiyi.lu@mediatek.com> (raw)
In-Reply-To: <1560998286-9189-1-git-send-email-weiyi.lu@mediatek.com>
Put clock enable and disable control in separate function.
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
---
drivers/soc/mediatek/mtk-scpsys.c | 45 ++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index 1a6a4ab..5b73e4e 100644
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -207,6 +207,29 @@ static int scpsys_regulator_disable(struct scp_domain *scpd)
return regulator_disable(scpd->supply);
}
+static void scpsys_clk_disable(struct clk *clk[], int max_num)
+{
+ int i;
+
+ for (i = max_num - 1; i >= 0; i--)
+ clk_disable_unprepare(clk[i]);
+}
+
+static int scpsys_clk_enable(struct clk *clk[], int max_num)
+{
+ int i, ret = 0;
+
+ for (i = 0; i < max_num && clk[i]; i++) {
+ ret = clk_prepare_enable(clk[i]);
+ if (ret) {
+ scpsys_clk_disable(clk, i);
+ break;
+ }
+ }
+
+ return ret;
+}
+
static int scpsys_power_on(struct generic_pm_domain *genpd)
{
struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd);
@@ -215,21 +238,14 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
u32 pdn_ack = scpd->data->sram_pdn_ack_bits;
u32 val;
int ret, tmp;
- int i;
ret = scpsys_regulator_enable(scpd);
if (ret < 0)
return ret;
- for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++) {
- ret = clk_prepare_enable(scpd->clk[i]);
- if (ret) {
- for (--i; i >= 0; i--)
- clk_disable_unprepare(scpd->clk[i]);
-
- goto err_clk;
- }
- }
+ ret = scpsys_clk_enable(scpd->clk, MAX_CLKS);
+ if (ret)
+ goto err_clk;
val = readl(ctl_addr);
val |= PWR_ON_BIT;
@@ -282,10 +298,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
return 0;
err_pwr_ack:
- for (i = MAX_CLKS - 1; i >= 0; i--) {
- if (scpd->clk[i])
- clk_disable_unprepare(scpd->clk[i]);
- }
+ scpsys_clk_disable(scpd->clk, MAX_CLKS);
err_clk:
scpsys_regulator_disable(scpd);
@@ -302,7 +315,6 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
u32 pdn_ack = scpd->data->sram_pdn_ack_bits;
u32 val;
int ret, tmp;
- int i;
if (scpd->data->bus_prot_mask) {
ret = mtk_infracfg_set_bus_protection(scp->infracfg,
@@ -343,8 +355,7 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
if (ret < 0)
goto out;
- for (i = 0; i < MAX_CLKS && scpd->clk[i]; i++)
- clk_disable_unprepare(scpd->clk[i]);
+ scpsys_clk_disable(scpd->clk, MAX_CLKS);
ret = scpsys_regulator_disable(scpd);
if (ret < 0)
--
1.8.1.1.dirty
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-20 2:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 2:37 [PATCH v6 00/14] Mediatek MT8183 scpsys support Weiyi Lu
2019-06-20 2:37 ` [PATCH v6 01/14] dt-bindings: mediatek: Add property to mt8183 smi-common Weiyi Lu
2019-06-20 2:37 ` [PATCH v6 02/14] dt-bindings: soc: Add MT8183 power dt-bindings Weiyi Lu
2019-06-20 2:37 ` [PATCH v6 03/14] soc: mediatek: Switch to SPDX license identifier Weiyi Lu
2019-06-20 2:37 ` [PATCH v6 04/14] soc: mediatek: Refactor polling timeout and documentation Weiyi Lu
2019-06-20 2:37 ` [PATCH v6 05/14] soc: mediatek: Refactor regulator control Weiyi Lu
2019-06-20 2:37 ` Weiyi Lu [this message]
2019-06-20 2:37 ` [PATCH v6 07/14] soc: mediatek: Refactor sram control Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 08/14] soc: mediatek: Refactor bus protection control Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 09/14] soc: mediatek: Add basic_clk_id to scp_power_data Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 10/14] soc: mediatek: Add multiple step bus protection control Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 11/14] soc: mediatek: Add subsys clock control for bus protection Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 12/14] soc: mediatek: Add extra sram control Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 13/14] soc: mediatek: Add MT8183 scpsys support Weiyi Lu
2019-06-20 2:38 ` [PATCH v6 14/14] arm64: dts: Add power controller device node of MT8183 Weiyi Lu
2019-07-01 8:57 ` CK Hu
2019-07-15 8:07 ` CK Hu
2019-07-15 9:07 ` Weiyi Lu
2019-07-16 1:50 ` CK Hu
2019-07-23 4:06 ` Weiyi Lu
2019-07-26 2:07 ` CK Hu
2019-08-29 7:19 ` Matthias Brugger
2019-08-29 8:15 ` CK Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560998286-9189-7-git-send-email-weiyi.lu@mediatek.com \
--to=weiyi.lu@mediatek.com \
--cc=drinkcat@chromium.org \
--cc=fan.chen@mediatek.com \
--cc=jamesjj.liao@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robh@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=yong.wu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).