From patchwork Tue Apr 26 17:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 1622532 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=kpnmail.nl header.i=@kpnmail.nl header.a=rsa-sha256 header.s=kpnmail01 header.b=HyCVFZZJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KnpQY30pVz9s75 for ; Wed, 27 Apr 2022 03:14:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A319F81B5B; Tue, 26 Apr 2022 19:14:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=openbsd.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=kpnmail.nl header.i=@kpnmail.nl header.b="HyCVFZZJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3915080107; Tue, 26 Apr 2022 19:14:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_SOFTFAIL autolearn=no autolearn_force=no version=3.4.2 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F1F7481B5B for ; Tue, 26 Apr 2022 19:14:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=openbsd.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=kettenis@openbsd.org X-KPN-MessageId: 0c4a1f87-c584-11ec-8ee3-005056992ed3 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id 0c4a1f87-c584-11ec-8ee3-005056992ed3; Tue, 26 Apr 2022 19:12:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kpnmail.nl; s=kpnmail01; h=mime-version:message-id:date:subject:to:from; bh=UUaTsTtD1SOc/+I5KdjwEc7A5/3dZYL+2Cq/2u+tXEo=; b=HyCVFZZJgtrnSY6Iu0FIsecywWrwNrY5atqhTg7ofkk+vL1HelxxH8VaygGGXcak8RANhXbqieGC6 v2tyEdhogWb2YeFnZcgib0I3Mji87dKtl5yTSrCzq4SMWy4/ceyKecF29pP11Zcqn0h+NtrqEEKmJI CSKJNIHWOQYGnjFc= X-KPN-MID: 33|kuYALct4lKwEF5HU62W8vcpIhtpK7Vln1zOsKt47KEI4aNv+b2LgeefLu6p/gTN GJDfezc/LGqeRCEWFXY2Jeg== X-KPN-VerifiedSender: No X-CMASSUN: 33|SzgQb86cf98E+/qCAiBPbt4BhyL+9pPWNZIGKiTyXLZt70AoptJwc111MubHZDV gFwOBaH4XhbVgu1vlVgm2FA== X-Originating-IP: 80.61.163.207 Received: from copland.sibelius.xs4all.nl (80-61-163-207.fixed.kpn.net [80.61.163.207]) by smtp.xs4all.nl (Halon) with ESMTPSA id 4a5c034d-c584-11ec-a066-00505699d6e5; Tue, 26 Apr 2022 19:14:11 +0200 (CEST) From: Mark Kettenis To: u-boot@lists.denx.de Cc: marex@denx.de, patrick.delaunay@foss.st.com, sjg@chromium.org, Mark Kettenis Subject: [PATCH] power: domain: apple: Restore reset ops that return 0 Date: Tue, 26 Apr 2022 19:14:09 +0200 Message-Id: <20220426171409.58716-1-kettenis@openbsd.org> X-Mailer: git-send-email 2.35.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean These were removed inadvertently in commit 20874a60722b. Fixes a crash on Apple M1 systems. Signed-off-by: Mark Kettenis --- drivers/power/domain/apple-pmgr.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/power/domain/apple-pmgr.c b/drivers/power/domain/apple-pmgr.c index 402c5b1fd1..88eafd0468 100644 --- a/drivers/power/domain/apple-pmgr.c +++ b/drivers/power/domain/apple-pmgr.c @@ -42,6 +42,16 @@ static int apple_reset_of_xlate(struct reset_ctl *reset_ctl, return 0; } +static int apple_reset_request(struct reset_ctl *reset_ctl) +{ + return 0; +} + +static int apple_reset_free(struct reset_ctl *reset_ctl) +{ + return 0; +} + static int apple_reset_assert(struct reset_ctl *reset_ctl) { struct apple_pmgr_priv *priv = dev_get_priv(reset_ctl->dev->parent); @@ -70,6 +80,8 @@ static int apple_reset_deassert(struct reset_ctl *reset_ctl) struct reset_ops apple_reset_ops = { .of_xlate = apple_reset_of_xlate, + .request = apple_reset_request, + .rfree = apple_reset_free, .rst_assert = apple_reset_assert, .rst_deassert = apple_reset_deassert, };