From patchwork Fri Mar 23 09:36:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10303135 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F96160386 for ; Fri, 23 Mar 2018 09:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D9EA28B6A for ; Fri, 23 Mar 2018 09:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7146128C47; Fri, 23 Mar 2018 09:38:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F062428952 for ; Fri, 23 Mar 2018 09:38:44 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=jq7nWs25hIj4yLn5bMqmB+dJB9iQQbjM25MDc9+U2tY=; b=b75T0ttWdP2/lAxEJPExqw2JKz yZ44DcK24ldIzvYrUyVQxLgW0sjRQqNw0BaEkNfhYUJ3KFsGkoz0J3EBsxighXJTqdBgg/PXSoIYo eLfpUreKF0qG7lWZQ3cdcTu5uE219j4w5bFJaWZz/zb2c9VjKMa5pLng9ShvlMKp0UhnbupuMBNNY mY/BhsZU3vVwo9zwrerGv3sGG4dVPljsx8mSJwsav6adsbdE4hxlkFxNaQd3rT1lbsma3O0CpKUBG gih0kIF0qZ8IiNgoASHFsQJ48/UU+u2oTmYur/hMAS07EpsuLwz0G9AgKLWATD6OqXST6XGuoXW7Y AijIy3WA==; 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 1ezJ9g-0005kF-Ae; Fri, 23 Mar 2018 09:38:36 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezJ7b-0004ed-QL for linux-arm-kernel@lists.infradead.org; Fri, 23 Mar 2018 09:36:31 +0000 Received: by mail-wm0-x242.google.com with SMTP id t7so2318881wmh.5 for ; Fri, 23 Mar 2018 02:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qtztQ/9TOPi+dkEP6jplsOMVA3ubNWNtfI7tSZpTpxI=; b=U/+jGi/QzDP5WqpQ7WIThZR+awrXeGD10WWxzSAq6CG9H1efrVllPxVCdZ48RDvEnw 2VKY2uD6AnJ+/KblJ92eddMZEZn80I1sYwbNoSwngoekhQ9rwvOiTKbY/JbWhYqR3FDr QRdQf0CwZsA3IJbsN3/XLNY9zcPuipaBdM36D8TXC9FbXTSY55gweol8iKUgou28ii1w KKhYEWuWx0mKe5BmCf8LnLmAmryf7g0n5Q1UpCsNnCDjNvUlmG0UM9yfLt1gYDJVvHHY PIsHYcPB3Tb/A0lcY/EK5H2iUTFmtPoU8vEh6fQLmC2yN2XMGZtBw9wW1ii171/u15RI nYgQ== 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:in-reply-to :references; bh=qtztQ/9TOPi+dkEP6jplsOMVA3ubNWNtfI7tSZpTpxI=; b=smLgqqx4F8M7aNt48xwLMJoBBRR3ucotPx1pOdupuBEIWabgs2+04Tfyx4GrzhVMsA ffox8LWPNqnZRVtzaHwXQJ23hnYRNa+zibDyEMKvsjeA9tON9lTT6XbHEQngpo0y/qDg 0B9+vK2eLrbgf11brFvMT5uLqDelq3jl4ky3epwqRICRCIkPRIefi168EsjHI3Yz839/ ujmIkQ1x28ucYrosY0bxp+L0jZbCrIlw9Dy8OCr1NY1XhlXE7vbNAztJeY6q/QT6nuFn 4BbVgH8ZAV/TyBx1/Ms6xBxFenrinVStaHaIffYJ6xa4e9pUM8s8D3MHAY2fANKzecAH 1WKQ== X-Gm-Message-State: AElRT7GyEb7vpGR/1GmLmRsh8XKB0Um8Owc9e243PoIePaAX+HrZ/b/2 K0Pwh+FHJ7uCO61dkn8BOZ4LEQ== X-Google-Smtp-Source: AG47ELvK9O6wNk+rOEP9TNTe3ppvetCY6hgbMl3sogkm3SYU4AU1yrQgsWClxtTAFHyPevVVZzF2Dg== X-Received: by 10.28.227.66 with SMTP id a63mr7749066wmh.6.1521797786442; Fri, 23 Mar 2018 02:36:26 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-NIC-1-208-99.w2-15.abo.wanadoo.fr. [2.15.55.99]) by smtp.gmail.com with ESMTPSA id s125sm8045203wmf.4.2018.03.23.02.36.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 02:36:25 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Rob Herring , Mark Rutland , Russell King , David Lechner , Michael Turquette , Stephen Boyd , Ohad Ben-Cohen , Bjorn Andersson , Philipp Zabel Subject: [PATCH v2 7/8] remoteproc: da8xx: use the reset framework Date: Fri, 23 Mar 2018 10:36:08 +0100 Message-Id: <20180323093609.24576-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180323093609.24576-1-brgl@bgdev.pl> References: <20180323093609.24576-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180323_023628_070628_27770747 X-CRM114-Status: GOOD ( 19.76 ) 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: devicetree@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Switch to using the reset framework instead of handcoded reset routines we used so far. Signed-off-by: Bartosz Golaszewski --- drivers/remoteproc/da8xx_remoteproc.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index f134192922e0..b99c0f0cc38e 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -20,8 +21,6 @@ #include #include -#include /* for davinci_clk_reset_assert/deassert() */ - #include "remoteproc_internal.h" static char *da8xx_fw_name; @@ -72,6 +71,7 @@ struct da8xx_rproc { struct da8xx_rproc_mem *mem; int num_mems; struct clk *dsp_clk; + struct reset_control *dsp_reset; void (*ack_fxn)(struct irq_data *data); struct irq_data *irq_data; void __iomem *chipsig; @@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc) struct device *dev = rproc->dev.parent; struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv; struct clk *dsp_clk = drproc->dsp_clk; + struct reset_control *dsp_reset = drproc->dsp_reset; int ret; /* hw requires the start (boot) address be on 1KB boundary */ @@ -155,7 +156,11 @@ static int da8xx_rproc_start(struct rproc *rproc) return ret; } - davinci_clk_reset_deassert(dsp_clk); + ret = reset_control_deassert(dsp_reset); + if (ret) { + dev_err(dev, "reset_control_deassert() failed: %d\n", ret); + return ret; + } return 0; } @@ -163,8 +168,15 @@ static int da8xx_rproc_start(struct rproc *rproc) static int da8xx_rproc_stop(struct rproc *rproc) { struct da8xx_rproc *drproc = rproc->priv; + int ret; + + ret = reset_control_assert(drproc->dsp_reset); + if (ret) { + dev_err(rproc->dev.parent, + "reset_control_assert() failed: %d\n", ret); + return ret; + } - davinci_clk_reset_assert(drproc->dsp_clk); clk_disable_unprepare(drproc->dsp_clk); return 0; @@ -232,6 +244,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) struct resource *bootreg_res; struct resource *chipsig_res; struct clk *dsp_clk; + struct reset_control *dsp_reset; void __iomem *chipsig; void __iomem *bootreg; int irq; @@ -268,6 +281,17 @@ static int da8xx_rproc_probe(struct platform_device *pdev) return PTR_ERR(dsp_clk); } + dsp_reset = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(dsp_reset)) { + /* The platform lookup may not be registered yet. */ + if (PTR_ERR(dsp_reset) == -ENOENT) + return -EPROBE_DEFER; + + dev_err(dev, "unable to get reset control: %ld\n", + PTR_ERR(dsp_reset)); + return PTR_ERR(dsp_reset); + } + if (dev->of_node) { ret = of_reserved_mem_device_init(dev); if (ret) { @@ -309,7 +333,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) * *not* in reset, but da8xx_rproc_start() needs the DSP to be * held in reset at the time it is called. */ - ret = davinci_clk_reset_assert(drproc->dsp_clk); + ret = reset_control_assert(dsp_reset); if (ret) goto free_rproc;