From: Rex-BC Chen <rex-bc.chen@mediatek.com>
To: <mturquette@baylibre.com>, <sboyd@kernel.org>,
<matthias.bgg@gmail.com>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>
Cc: <p.zabel@pengutronix.de>,
<angelogioacchino.delregno@collabora.com>,
<nfraprado@collabora.com>, <chun-jie.chen@mediatek.com>,
<wenst@chromium.org>, <runyang.chen@mediatek.com>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-clk@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Rex-BC Chen <rex-bc.chen@mediatek.com>
Subject: [RESEND v8 04/19] clk: mediatek: reset: Extract common drivers to update function
Date: Mon, 23 May 2022 17:33:31 +0800 [thread overview]
Message-ID: <20220523093346.28493-5-rex-bc.chen@mediatek.com> (raw)
In-Reply-To: <20220523093346.28493-1-rex-bc.chen@mediatek.com>
To make drivers more clear and readable, we extract common code
within assert and deassert to mtk_reset_update_set_clr() and
mtk_reset_update().
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
drivers/clk/mediatek/reset.c | 38 +++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
index 5cbbcc22a4fc..22fa9f09752c 100644
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -12,24 +12,27 @@
#include "reset.h"
-static int mtk_reset_assert(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int val = deassert ? 0 : ~0;
return regmap_update_bits(data->regmap,
data->regofs + ((id / 32) << 2),
- BIT(id % 32), ~0);
+ BIT(id % 32), val);
+}
+
+static int mtk_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update(rcdev, id, false);
}
static int mtk_reset_deassert(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_update_bits(data->regmap,
- data->regofs + ((id / 32) << 2),
- BIT(id % 32), 0);
+ return mtk_reset_update(rcdev, id, true);
}
static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
@@ -43,24 +46,27 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
return mtk_reset_deassert(rcdev, id);
}
-static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int deassert_ofs = deassert ? 0x4 : 0;
return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4),
+ data->regofs + ((id / 32) << 4) + deassert_ofs,
BIT(id % 32));
}
+static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update_set_clr(rcdev, id, false);
+}
+
static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4) + 0x4,
- BIT(id % 32));
+ return mtk_reset_update_set_clr(rcdev, id, true);
}
static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,
--
2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Rex-BC Chen <rex-bc.chen@mediatek.com>
To: <mturquette@baylibre.com>, <sboyd@kernel.org>,
<matthias.bgg@gmail.com>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>
Cc: <p.zabel@pengutronix.de>,
<angelogioacchino.delregno@collabora.com>,
<nfraprado@collabora.com>, <chun-jie.chen@mediatek.com>,
<wenst@chromium.org>, <runyang.chen@mediatek.com>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-clk@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Rex-BC Chen <rex-bc.chen@mediatek.com>
Subject: [RESEND v8 04/19] clk: mediatek: reset: Extract common drivers to update function
Date: Mon, 23 May 2022 17:33:31 +0800 [thread overview]
Message-ID: <20220523093346.28493-5-rex-bc.chen@mediatek.com> (raw)
In-Reply-To: <20220523093346.28493-1-rex-bc.chen@mediatek.com>
To make drivers more clear and readable, we extract common code
within assert and deassert to mtk_reset_update_set_clr() and
mtk_reset_update().
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
drivers/clk/mediatek/reset.c | 38 +++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
index 5cbbcc22a4fc..22fa9f09752c 100644
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -12,24 +12,27 @@
#include "reset.h"
-static int mtk_reset_assert(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int val = deassert ? 0 : ~0;
return regmap_update_bits(data->regmap,
data->regofs + ((id / 32) << 2),
- BIT(id % 32), ~0);
+ BIT(id % 32), val);
+}
+
+static int mtk_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update(rcdev, id, false);
}
static int mtk_reset_deassert(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_update_bits(data->regmap,
- data->regofs + ((id / 32) << 2),
- BIT(id % 32), 0);
+ return mtk_reset_update(rcdev, id, true);
}
static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
@@ -43,24 +46,27 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
return mtk_reset_deassert(rcdev, id);
}
-static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int deassert_ofs = deassert ? 0x4 : 0;
return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4),
+ data->regofs + ((id / 32) << 4) + deassert_ofs,
BIT(id % 32));
}
+static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update_set_clr(rcdev, id, false);
+}
+
static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4) + 0x4,
- BIT(id % 32));
+ return mtk_reset_update_set_clr(rcdev, id, true);
}
static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: Rex-BC Chen <rex-bc.chen@mediatek.com>
To: <mturquette@baylibre.com>, <sboyd@kernel.org>,
<matthias.bgg@gmail.com>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>
Cc: <p.zabel@pengutronix.de>,
<angelogioacchino.delregno@collabora.com>,
<nfraprado@collabora.com>, <chun-jie.chen@mediatek.com>,
<wenst@chromium.org>, <runyang.chen@mediatek.com>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-clk@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Rex-BC Chen <rex-bc.chen@mediatek.com>
Subject: [RESEND v8 04/19] clk: mediatek: reset: Extract common drivers to update function
Date: Mon, 23 May 2022 17:33:31 +0800 [thread overview]
Message-ID: <20220523093346.28493-5-rex-bc.chen@mediatek.com> (raw)
In-Reply-To: <20220523093346.28493-1-rex-bc.chen@mediatek.com>
To make drivers more clear and readable, we extract common code
within assert and deassert to mtk_reset_update_set_clr() and
mtk_reset_update().
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---
drivers/clk/mediatek/reset.c | 38 +++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
index 5cbbcc22a4fc..22fa9f09752c 100644
--- a/drivers/clk/mediatek/reset.c
+++ b/drivers/clk/mediatek/reset.c
@@ -12,24 +12,27 @@
#include "reset.h"
-static int mtk_reset_assert(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int val = deassert ? 0 : ~0;
return regmap_update_bits(data->regmap,
data->regofs + ((id / 32) << 2),
- BIT(id % 32), ~0);
+ BIT(id % 32), val);
+}
+
+static int mtk_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update(rcdev, id, false);
}
static int mtk_reset_deassert(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_update_bits(data->regmap,
- data->regofs + ((id / 32) << 2),
- BIT(id % 32), 0);
+ return mtk_reset_update(rcdev, id, true);
}
static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
@@ -43,24 +46,27 @@ static int mtk_reset(struct reset_controller_dev *rcdev, unsigned long id)
return mtk_reset_deassert(rcdev, id);
}
-static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
- unsigned long id)
+static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id, bool deassert)
{
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
+ unsigned int deassert_ofs = deassert ? 0x4 : 0;
return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4),
+ data->regofs + ((id / 32) << 4) + deassert_ofs,
BIT(id % 32));
}
+static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return mtk_reset_update_set_clr(rcdev, id, false);
+}
+
static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
unsigned long id)
{
- struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
-
- return regmap_write(data->regmap,
- data->regofs + ((id / 32) << 4) + 0x4,
- BIT(id % 32));
+ return mtk_reset_update_set_clr(rcdev, id, true);
}
static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,
--
2.18.0
_______________________________________________
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:[~2022-05-23 9:34 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 9:33 [RESEND v8 00/19] Cleanup MediaTek clk reset drivers and support SoCs Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` [RESEND v8 01/19] clk: mediatek: reset: Add reset.h Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:50 ` Stephen Boyd
2022-06-16 1:50 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 02/19] clk: mediatek: reset: Fix written reset bit offset Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:50 ` Stephen Boyd
2022-06-16 1:50 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 03/19] clk: mediatek: reset: Refine and reorder functions in reset.c Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:50 ` Stephen Boyd
2022-06-16 1:50 ` Stephen Boyd
2022-05-23 9:33 ` Rex-BC Chen [this message]
2022-05-23 9:33 ` [RESEND v8 04/19] clk: mediatek: reset: Extract common drivers to update function Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:50 ` Stephen Boyd
2022-06-16 1:50 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 05/19] clk: mediatek: reset: Merge and revise reset register function Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:51 ` Stephen Boyd
2022-06-16 1:51 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 06/19] clk: mediatek: reset: Revise structure to control reset register Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:51 ` Stephen Boyd
2022-06-16 1:51 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 07/19] clk: mediatek: reset: Support nonsequence base offsets of reset registers Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:51 ` Stephen Boyd
2022-06-16 1:51 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 08/19] clk: mediatek: reset: Support inuput argument index mode Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:51 ` Stephen Boyd
2022-06-16 1:51 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 09/19] clk: mediatek: reset: Change return type for clock reset register function Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:52 ` Stephen Boyd
2022-06-16 1:52 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 10/19] clk: mediatek: reset: Add new register reset function with device Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:52 ` Stephen Boyd
2022-06-16 1:52 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 11/19] clk: mediatek: reset: Add reset support for simple probe Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:53 ` Stephen Boyd
2022-06-16 1:53 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 12/19] dt-bindings: arm: mediatek: Add #reset-cells property for MT8192/MT8195 Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:53 ` Stephen Boyd
2022-06-16 1:53 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 13/19] dt-bindings: reset: mediatek: Add infra_ao reset index " Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:53 ` Stephen Boyd
2022-06-16 1:53 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 14/19] clk: mediatek: reset: Add infra_ao reset support " Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:55 ` Stephen Boyd
2022-06-16 1:55 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 15/19] arm64: dts: mediatek: Add infra #reset-cells property for MT8192 Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` [RESEND v8 16/19] arm64: dts: mediatek: Add infra #reset-cells property for MT8195 Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` [RESEND v8 17/19] dt-bindings: reset: mediatek: Add infra_ao reset index for MT8186 Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:55 ` Stephen Boyd
2022-06-16 1:55 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 18/19] dt-bindings: arm: mediatek: Add #reset-cells property " Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:55 ` Stephen Boyd
2022-06-16 1:55 ` Stephen Boyd
2022-05-23 9:33 ` [RESEND v8 19/19] clk: mediatek: reset: Add infra_ao reset support " Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-05-23 9:33 ` Rex-BC Chen
2022-06-16 1:55 ` Stephen Boyd
2022-06-16 1:55 ` Stephen Boyd
2022-05-23 10:28 ` [RESEND v8 00/19] Cleanup MediaTek clk reset drivers and support SoCs AngeloGioacchino Del Regno
2022-05-23 10:28 ` AngeloGioacchino Del Regno
2022-05-23 10:28 ` AngeloGioacchino Del Regno
2022-06-13 5:26 ` Rex-BC Chen
2022-06-13 5:26 ` Rex-BC Chen
2022-06-13 5:26 ` Rex-BC Chen
2022-06-16 1:57 ` Stephen Boyd
2022-06-16 1:57 ` Stephen Boyd
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=20220523093346.28493-5-rex-bc.chen@mediatek.com \
--to=rex-bc.chen@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chun-jie.chen@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mturquette@baylibre.com \
--cc=nfraprado@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=runyang.chen@mediatek.com \
--cc=sboyd@kernel.org \
--cc=wenst@chromium.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.