From patchwork Tue Apr 17 17:30:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10346149 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 08C5960542 for ; Tue, 17 Apr 2018 17:32:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF5C6285C3 for ; Tue, 17 Apr 2018 17:32:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3DFF285C5; Tue, 17 Apr 2018 17:32:11 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 894B7285C3 for ; Tue, 17 Apr 2018 17:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185AbeDQRbn (ORCPT ); Tue, 17 Apr 2018 13:31:43 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35182 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752979AbeDQRa5 (ORCPT ); Tue, 17 Apr 2018 13:30:57 -0400 Received: by mail-wr0-f193.google.com with SMTP id w3so21098265wrg.2 for ; Tue, 17 Apr 2018 10:30:56 -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=jnbLduVsTf8GWTukTWip99X3tFjxhWG1jB1DTOtr3zY=; b=zX1oUmuiMuXoN5Zp3ygQzp/nLh0GFNNXCp6hZJhECbL+VmiNjc0O94k/g3cBSLYGLa 2FQPhDSle2KMn8ct1HnCrOfTwAPGMZIvP39rV2PMFO0MnBPcLZPhuiZ8Ji7gvlY50X+G CcYMbvQMFfUY/UsruPwkmBAv/UNfLnAdnKNkg2BlqdU3hmR8OwMBvTWAnsKo07Y8RYHS CE0r9rOgpwZlnemXcY5mLSnvLXG+ZjpBzwy9khAeBmHAq9iYOGQuwkg0bd9E3NWIIw4n 2fNAihRvZSBgvzxrIZl6weHBb8vgbMVPxUPIfUtK4lRqUZKLmDpWjSQHO1G5v4Q95nvG Bffg== 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=jnbLduVsTf8GWTukTWip99X3tFjxhWG1jB1DTOtr3zY=; b=KYb0u+bT1YJMpAWngA/LEkF56MKK964ulCtnxnxFNmWE+bVMjqUI1jfNGakVfIZtL1 tQd+H4Peb2d8k7sW0ovkaaBAqStf9gT7KodumCn6sCNWBihXPzDCPClxtubnGUjG71m8 b9/Z9SQd76NlF26OmxXfO8kqqF9lwat6GQmNKnqqUUhdBK2CPpUZ5Ft+Wf3QorlB50qm yid+prAFSn0RHByvQ/jf2vyzlt/OrwD8d8OHlgtYRYphEBM6WjpjaJK72f+lMC5foPWt ZE5FG8DJ6YX1+SI5MQdZuEDYm8GB2TuzgdQpt3ztBmnb/DKU3IfA/B23t8vb+gXN8wue 7b4g== X-Gm-Message-State: ALQs6tDXwpt/SPRXsnHVsiytPX2fYTTjSxefB4efUwV/f9F7prwXMlYz IHtX5fs8r6R326mskMS61jaKqg== X-Google-Smtp-Source: AIpwx482TKIiao57z7WTPUH6uNizSwcaH20ENwhRypWSHDG4LNVa7X36ztATRu9lcmsSxGXg6gDW6A== X-Received: by 10.223.193.5 with SMTP id r5mr2200664wre.274.1523986255279; Tue, 17 Apr 2018 10:30:55 -0700 (PDT) Received: from brgl-bgdev.home ([2a01:cb1d:af:5b00:e837:b8d5:48c1:571b]) by smtp.gmail.com with ESMTPSA id b47sm14042341wrg.13.2018.04.17.10.30.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 10:30:54 -0700 (PDT) From: Bartosz Golaszewski To: Suman Anna , Sekhar Nori , Kevin Hilman , Rob Herring , Mark Rutland , Russell King , David Lechner , Michael Turquette , Stephen Boyd , Ohad Ben-Cohen , Bjorn Andersson , Philipp Zabel Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-remoteproc@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v6 6/7] remoteproc/davinci: use the reset framework Date: Tue, 17 Apr 2018 19:30:37 +0200 Message-Id: <20180417173038.25510-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417173038.25510-1-brgl@bgdev.pl> References: <20180417173038.25510-1-brgl@bgdev.pl> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.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 Reviewed-by: Sekhar Nori Reviewed-by: Philipp Zabel --- 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 b668e32996e2..76c06b70a1c6 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,12 @@ 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); + clk_disable_unprepare(dsp_clk); + return ret; + } return 0; } @@ -163,8 +169,15 @@ static int da8xx_rproc_start(struct rproc *rproc) static int da8xx_rproc_stop(struct rproc *rproc) { struct da8xx_rproc *drproc = rproc->priv; + struct device *dev = rproc->dev.parent; + int ret; + + ret = reset_control_assert(drproc->dsp_reset); + if (ret) { + dev_err(dev, "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 +245,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 +282,15 @@ 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)) { + if (PTR_ERR(dsp_reset) != -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) { @@ -287,6 +310,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) drproc = rproc->priv; drproc->rproc = rproc; drproc->dsp_clk = dsp_clk; + drproc->dsp_reset = dsp_reset; rproc->has_iommu = false; ret = da8xx_rproc_get_internal_memories(pdev, drproc); @@ -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;