From patchwork Thu Apr 12 08:03:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 897532 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="tZZ8OfVw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40MD1q0d9sz9rxp for ; Thu, 12 Apr 2018 18:03:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AE4FBC21C6A; Thu, 12 Apr 2018 08:03:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D3FCFC21C3F; Thu, 12 Apr 2018 08:03:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D63CBC21C38; Thu, 12 Apr 2018 08:03:32 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 43D8FC21C2F for ; Thu, 12 Apr 2018 08:03:32 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id l16so4256761wmh.2 for ; Thu, 12 Apr 2018 01:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=l59WzQN9uNFBZ1Tira5qF4Fp/04HXcVxD5SBamKai8s=; b=tZZ8OfVwv6GndIl/I11NMQqoxWuWJYGK4r6MUCgMY0Gbt69pYUyIYiNlekJ4lOhVAH b1tiQNEBvGzrTRohZI5TkgZyeoW4RJ1kEug/UcUUKAtTNY1YbqIjEmXWnBpMZZY8Cvm6 zJoQjHqvwT9WPP/6Ut7mR2BlGCod9LByJo9cOZno5MSBxaaFv9msQfldMm4fnZo4WARf uItTaL6gyAusf06TQuNPapw8RNyt2vKCf7zGxlKY9u0GSqYLY84kQNnj5l2QP3LqmfK6 r+maHiq54WmYGcu5FdyIU7ZPn1TLC65oRqwx/6YwVeXcpwMwNq71mzNzD+/BeJ3A6jm1 8qHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=l59WzQN9uNFBZ1Tira5qF4Fp/04HXcVxD5SBamKai8s=; b=LMjGlOtCIBUsmQibGkQf2OmbLTAq7Z+e9CcBzX7JtSjFNkJeI76MK116EoEIXlEsOq NDO+UQyp5cZLvOkSG8yV9xAJ62vc4xhhjU2WCpQ3A6x6Y+Ni4j0O6MbkGCOX8jwY/i7R Ae5ohRlJBn8zlKZd87izcYKsHK9CZrf6VFiad1nGHuuZ4NM6KNlQHf8KKeVW3FNsg3eY OBn03EvvOUgkeB1sLmF0ZhUf8flJDxWhj1f1QKGhneDGghIKLp+ZjGQaDUJ4BGz5G1Co okmcz6r5BELW/5SBplQr5Hyj9f/AYn+qysnbciFMdV2wuTc3kNTmDxQosXTwOelzCyYW B9mg== X-Gm-Message-State: ALQs6tBS0vJbTQjlrdClwgwEb1CPHHPy1gckaDsAOu7/GC4Y8PYBUkSQ U6R1+E3GbaSfUt3VETyodsEiXw== X-Google-Smtp-Source: AIpwx49+v0tc5zl0LbQnuOaqrl/6UAQV407IJC9MbRSU67h16omjsks5UMeI5xbKXeWXWvGcrs5AKw== X-Received: by 10.28.71.77 with SMTP id u74mr5045311wma.149.1523520211740; Thu, 12 Apr 2018 01:03:31 -0700 (PDT) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g4sm4078107wrd.1.2018.04.12.01.03.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 01:03:31 -0700 (PDT) From: Neil Armstrong To: trini@konsulko.com, sjg@chromium.org, u-boot@lists.denx.de Date: Thu, 12 Apr 2018 10:03:19 +0200 Message-Id: <1523520199-12341-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 Cc: linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH] reset: fix bulk API when DM_RESET is disabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Signed-off-by: Neil Armstrong Reviewed-by: Simon Glass --- include/reset.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/reset.h b/include/reset.h index d38f176..ae247ce 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; }