Skip to content

Commit 1142575

Browse files
mtk-rex-bc-chenbebarino
authored andcommitted
clk: mediatek: reset: Extract common drivers to update function
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> Link: https://lore.kernel.org/r/20220523093346.28493-5-rex-bc.chen@mediatek.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 086bcb5 commit 1142575

1 file changed

Lines changed: 22 additions & 16 deletions

File tree

drivers/clk/mediatek/reset.c

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,27 @@
1212

1313
#include "reset.h"
1414

15-
static int mtk_reset_assert(struct reset_controller_dev *rcdev,
16-
unsigned long id)
15+
static int mtk_reset_update(struct reset_controller_dev *rcdev,
16+
unsigned long id, bool deassert)
1717
{
1818
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
19+
unsigned int val = deassert ? 0 : ~0;
1920

2021
return regmap_update_bits(data->regmap,
2122
data->regofs + ((id / 32) << 2),
22-
BIT(id % 32), ~0);
23+
BIT(id % 32), val);
24+
}
25+
26+
static int mtk_reset_assert(struct reset_controller_dev *rcdev,
27+
unsigned long id)
28+
{
29+
return mtk_reset_update(rcdev, id, false);
2330
}
2431

2532
static int mtk_reset_deassert(struct reset_controller_dev *rcdev,
2633
unsigned long id)
2734
{
28-
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
29-
30-
return regmap_update_bits(data->regmap,
31-
data->regofs + ((id / 32) << 2),
32-
BIT(id % 32), 0);
35+
return mtk_reset_update(rcdev, id, true);
3336
}
3437

3538
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)
4346
return mtk_reset_deassert(rcdev, id);
4447
}
4548

46-
static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
47-
unsigned long id)
49+
static int mtk_reset_update_set_clr(struct reset_controller_dev *rcdev,
50+
unsigned long id, bool deassert)
4851
{
4952
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
53+
unsigned int deassert_ofs = deassert ? 0x4 : 0;
5054

5155
return regmap_write(data->regmap,
52-
data->regofs + ((id / 32) << 4),
56+
data->regofs + ((id / 32) << 4) + deassert_ofs,
5357
BIT(id % 32));
5458
}
5559

60+
static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev,
61+
unsigned long id)
62+
{
63+
return mtk_reset_update_set_clr(rcdev, id, false);
64+
}
65+
5666
static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
5767
unsigned long id)
5868
{
59-
struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);
60-
61-
return regmap_write(data->regmap,
62-
data->regofs + ((id / 32) << 4) + 0x4,
63-
BIT(id % 32));
69+
return mtk_reset_update_set_clr(rcdev, id, true);
6470
}
6571

6672
static int mtk_reset_set_clr(struct reset_controller_dev *rcdev,

0 commit comments

Comments
 (0)