bcm27xx: update 6.1 patches to latest version
[openwrt/staging/svanheule.git] / target / linux / bcm27xx / patches-6.1 / 950-0863-reset-reset-brcmstb-rescal-Support-shared-use.patch
1 From 87b1126181f79fb2558652af0d7fafd9deaab5f3 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Tue, 7 Sep 2021 14:49:00 +0100
4 Subject: [PATCH] reset: reset-brcmstb-rescal: Support shared use
5
6 reset_control_reset should not be used with shared reset controllers.
7 Add support for reset_control_assert and _deassert to get the desired
8 behaviour and avoid ugly warnings in the kernel log.
9
10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
11 ---
12 drivers/reset/reset-brcmstb-rescal.c | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15 --- a/drivers/reset/reset-brcmstb-rescal.c
16 +++ b/drivers/reset/reset-brcmstb-rescal.c
17 @@ -20,6 +20,7 @@ struct brcm_rescal_reset {
18 struct reset_controller_dev rcdev;
19 };
20
21 +/* Also doubles a deassert */
22 static int brcm_rescal_reset_set(struct reset_controller_dev *rcdev,
23 unsigned long id)
24 {
25 @@ -52,6 +53,13 @@ static int brcm_rescal_reset_set(struct
26 return 0;
27 }
28
29 +/* A dummy function - deassert/reset does all the work */
30 +static int brcm_rescal_reset_assert(struct reset_controller_dev *rcdev,
31 + unsigned long id)
32 +{
33 + return 0;
34 +}
35 +
36 static int brcm_rescal_reset_xlate(struct reset_controller_dev *rcdev,
37 const struct of_phandle_args *reset_spec)
38 {
39 @@ -61,6 +69,8 @@ static int brcm_rescal_reset_xlate(struc
40
41 static const struct reset_control_ops brcm_rescal_reset_ops = {
42 .reset = brcm_rescal_reset_set,
43 + .deassert = brcm_rescal_reset_set,
44 + .assert = brcm_rescal_reset_assert,
45 };
46
47 static int brcm_rescal_reset_probe(struct platform_device *pdev)