From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 066B8C43381 for ; Mon, 25 Mar 2019 22:32:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C80A2206DF for ; Mon, 25 Mar 2019 22:32:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IhNBOQ5I"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="TDZ9qntS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C80A2206DF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4j2Bt1j0hZBJEjEMj5N4h6Rv9xaL/i+7yQjuhuMhh9o=; b=IhNBOQ5IrHa0xh jWEMiZyc5IfRf8wmNkr4bv1X2LxHXHalXPDdEOPSBaME0f2vv+a3WEGnv/I7asBZp4S5ehbcCiaKS v6XJmA6xJLEGq9HmjoDkLpvJoGTwBU8oZv2M3Ll+Co+PRzawWiHb/GxWzUc0qrnZUeH63T8cfUSgc isItiiySkxIoDKh56z/71xer9kFz/NsDoTBoEHIOQRLVakSAwav1Z6vQKBrDkvrodfn6obaRzBMq7 /aBn57it8s0GJybzMFUHienFD/JfdJfFgfenZzQtQylT4rZDX9sXPjcl2G9NYe9HvhQ5f7dlO5GAU cDqzTlJTwqb8yKY33Eqw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Y8a-0005T5-R8; Mon, 25 Mar 2019 22:32:12 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Y7Z-0004Cu-Mr for linux-arm-kernel@bombadil.infradead.org; Mon, 25 Mar 2019 22:31:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cPuP3rtYeYiu2ojT5YHC3s3JMLvP9V32qUx6ukkaLLs=; b=TDZ9qntS+dE6sT8oGVmDTIXQXT RH5epYwjkb+Z1jBrNz1YVvqpzSalrFRMsqAWIBOhYXZHMsSU/su/dBnRHdFhDdlNl/dV7SRwEz6cy 6hJpp0JSdkMq4jj0vByqCOoJpefI4lbRR1XxTMz5Moyba5mTzWuWoognv+P3NYsQmNUfolUGAdmCx mt3d3i9IURMgwpnYpxu0QZkoYp3gkNja3H+n+P5JQ26lUkqG4AKr+b2hG8qlYeJk5uFvxsJK4FXsW RuPexPRM+d3YyUIsvNBWfL19X8ra0vbB5cqq3Mi7oQ2KK2oxnh1mvOrsMCNYJGVgs/AQwx0NJPzMA LNb9sKwA==; Received: from muru.com ([72.249.23.125]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Xck-0000G1-3i for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 21:59:19 +0000 Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id AB55D8120; Mon, 25 Mar 2019 21:59:30 +0000 (UTC) From: Tony Lindgren To: linux-omap@vger.kernel.org Subject: [PATCH 09/14] bus: ti-sysc: Move rstctrl reset to happen later Date: Mon, 25 Mar 2019 14:58:44 -0700 Message-Id: <20190325215849.13182-10-tony@atomide.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325215849.13182-1-tony@atomide.com> References: <20190325215849.13182-1-tony@atomide.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_175918_363517_E4E05218 X-CRM114-Status: GOOD ( 16.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishanth Menon , Tero Kristo , Dave Gerlach , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Peter Ujfalusi , Faiz Abbas , Keerthy , linux-arm-kernel@lists.infradead.org, Roger Quadros Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org We should not do the reset until the clocks are enabled. Let's only init restctrl in sysc_init_resets() and do the reset later on in sysc_reset(). Signed-off-by: Tony Lindgren --- drivers/bus/ti-sysc.c | 61 ++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -339,38 +339,18 @@ static void sysc_disable_opt_clocks(struct sysc *ddata) } /** - * sysc_init_resets - reset module on init + * sysc_init_resets - init rstctrl reset line if configured * @ddata: device driver data * - * A module can have both OCP softreset control and external rstctrl. - * If more complicated rstctrl resets are needed, please handle these - * directly from the child device driver and map only the module reset - * for the parent interconnect target module device. - * - * Automatic reset of the module on init can be skipped with the - * "ti,no-reset-on-init" device tree property. + * See sysc_rstctrl_reset_deassert(). */ static int sysc_init_resets(struct sysc *ddata) { - int error; - ddata->rsts = devm_reset_control_array_get_optional_exclusive(ddata->dev); if (IS_ERR(ddata->rsts)) return PTR_ERR(ddata->rsts); - if (ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT) - goto deassert; - - error = reset_control_assert(ddata->rsts); - if (error) - return error; - -deassert: - error = reset_control_deassert(ddata->rsts); - if (error) - return error; - return 0; } @@ -1031,14 +1011,47 @@ static int sysc_legacy_init(struct sysc *ddata) return error; } +/** + * sysc_rstctrl_reset_deassert - deassert rstctrl reset + * @ddata: device driver data + * @reset: reset before deassert + * + * A module can have both OCP softreset control and external rstctrl. + * If more complicated rstctrl resets are needed, please handle these + * directly from the child device driver and map only the module reset + * for the parent interconnect target module device. + * + * Automatic reset of the module on init can be skipped with the + * "ti,no-reset-on-init" device tree property. + */ +static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset) +{ + int error; + + if (!ddata->rsts) + return 0; + + if (reset) { + error = reset_control_assert(ddata->rsts); + if (error) + return error; + } + + return reset_control_deassert(ddata->rsts); +} + static int sysc_reset(struct sysc *ddata) { int offset = ddata->offsets[SYSC_SYSCONFIG]; - int val; + int error, val; if (ddata->legacy_mode || offset < 0 || ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT) - return 0; + return sysc_rstctrl_reset_deassert(ddata, false); + + error = sysc_rstctrl_reset_deassert(ddata, true); + if (error) + return error; /* * Currently only support reset status in sysstatus. -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel