OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

clk: qcom: reset: support resetting multiple bits 

[ Upstream commit 4a52108936 ]

This patch adds the support for giving the complete bitmask
in reset structure and reset operation will use this bitmask
for all reset operations.

Currently, reset structure only takes a single bit for each reset
and then calculates the bitmask by using the BIT() macro.

However, this is not sufficient anymore for newer SoC-s like IPQ8074,
IPQ6018 and more, since their networking resets require multiple bits
to be asserted in order to properly reset the HW block completely.

So, in order to allow asserting multiple bits add "bitmask" field to
qcom_reset_map, and then use that bitmask value if its populated in the
driver, if its not populated, then we just default to existing behaviour
and calculate the bitmask on the fly.

Signed-off-by: Robert Marko <robimarko@gmail.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221107132901.489240-1-robimarko@gmail.com
Stable-dep-of: 349b5bed53 ("clk: qcom: ipq6018: fix networking resets")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Robert Marko 2022-11-07 14:28:59 +01:00 committed by Greg Kroah-Hartman
parent 0e481ef854
commit b20854ef6c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clk/qcom/reset.c
View File

@ -30,7 +30,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
rst = to_qcom_reset_controller(rcdev); rst = to_qcom_reset_controller(rcdev);
map = &rst->reset_map[id]; map = &rst->reset_map[id];
mask = BIT(map->bit); mask = map->bitmask ? map->bitmask : BIT(map->bit);
return regmap_update_bits(rst->regmap, map->reg, mask, mask); return regmap_update_bits(rst->regmap, map->reg, mask, mask);
} }
@ -44,7 +44,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
rst = to_qcom_reset_controller(rcdev); rst = to_qcom_reset_controller(rcdev);
map = &rst->reset_map[id]; map = &rst->reset_map[id];
mask = BIT(map->bit); mask = map->bitmask ? map->bitmask : BIT(map->bit);
return regmap_update_bits(rst->regmap, map->reg, mask, 0); return regmap_update_bits(rst->regmap, map->reg, mask, 0);
} }

1
drivers/clk/qcom/reset.h
View File

@ -12,6 +12,7 @@ struct qcom_reset_map {
unsigned int reg; unsigned int reg;
u8 bit; u8 bit;
u8 udelay; u8 udelay;
u32 bitmask;
}; };
struct regmap; struct regmap;