| Message ID | 20221107132901.489240-1-robimarko@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4a5210893625f89723ea210d7c630b730abb37ad |
| Headers | show |
| Series | [1/3] clk: qcom: reset: support resetting multiple bits | expand |
On Mon, 7 Nov 2022 14:28:59 +0100, Robert Marko wrote: > 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. > > [...] Applied, thanks! [1/3] clk: qcom: reset: support resetting multiple bits commit: 4a5210893625f89723ea210d7c630b730abb37ad [2/3] dt-bindings: clock: qcom: ipq8074: add missing networking resets commit: bb524058eb5635ee6ecbe3ef154d44088f7a2154 [3/3] clk: qcom: ipq8074: add missing networking resets commit: ce520e312918bc8f02d1c6bd58b288c2eb2d23c0 Best regards,
diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c index 2a16adb572d2..0e914ec7aeae 100644 --- a/drivers/clk/qcom/reset.c +++ b/drivers/clk/qcom/reset.c @@ -30,7 +30,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) rst = to_qcom_reset_controller(rcdev); 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); } @@ -44,7 +44,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id) rst = to_qcom_reset_controller(rcdev); 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); } diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h index b8c113582072..9a47c838d9b1 100644 --- a/drivers/clk/qcom/reset.h +++ b/drivers/clk/qcom/reset.h @@ -12,6 +12,7 @@ struct qcom_reset_map { unsigned int reg; u8 bit; u8 udelay; + u32 bitmask; }; struct regmap;
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> --- drivers/clk/qcom/reset.c | 4 ++-- drivers/clk/qcom/reset.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)