From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 12 Apr 2018 08:03:19 +0000 (+0200)
Subject: reset: fix bulk API when DM_RESET is disabled
X-Git-Tag: v2018.05-rc3~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1dd181ff2b3009405d12ad0b3782176490da2446;p=oweals%2Fu-boot.git

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.

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>
---

diff --git a/include/reset.h b/include/reset.h
index d38f1765ec..ae247ceb4f 100644
--- a/include/reset.h
+++ b/include/reset.h
@@ -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;
 }