qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: reset: fix bulk API when DM_RESET is disabled 

In the commit "reset: Add get/assert/deassert/release for bulk of reset signals"
the disabled reset_release_bulk() and reset_get_bulk() used the wrong
struct clk_bulk instead of struct reset_ctl_bulk.

Change-Id: Id98f7a6f6f4d5f2fca88f71b6254ca3795888d85
Fixes: 0c28233903b5 ("reset: Add get/assert/deassert/release for bulk of reset signals")
Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 1dd181ff2b3009405d12ad0b3782176490da2446)
This commit is contained in:
Neil Armstrong 2018-04-12 10:03:19 +02:00 committed by Frank Wang
parent f7a4178d8b
commit 2a2b09e3d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/reset.h
View File

@ -243,7 +243,8 @@ static inline int reset_get_by_index(struct udevice *dev, int index,
return -ENOTSUPP;
}
static inline int reset_get_bulk(struct udevice *dev, struct clk_bulk *bulk)
static inline int reset_get_bulk(struct udevice *dev,
struct reset_ctl_bulk *bulk)
{
return -ENOTSUPP;
}
@ -284,7 +285,7 @@ static inline int reset_release_all(struct reset_ctl *reset_ctl, int count)
return 0;
}
static inline int reset_release_bulk(struct clk_bulk *bulk)
static inline int reset_release_bulk(struct reset_ctl_bulk *bulk)
{
return 0;
}