From patchwork Tue Mar 27 09:20:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10309665 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 438F060353 for ; Tue, 27 Mar 2018 09:24:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3251729C47 for ; Tue, 27 Mar 2018 09:24:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26D5329C4D; Tue, 27 Mar 2018 09:24:25 +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 AD96E29C47 for ; Tue, 27 Mar 2018 09:24:24 +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=i8FWmSyt7vWIxO5s28uDwvhyqXLsAAcCVQ3oDAT2NhE=; b=ou4FS8sUXqztBE7ZgixWLCZDDF puPNG3Af8IhGCEoOj151OAs1fajA0kBPMHb8I9dEO0T45HXW08bb3BqIicecU0m/38OVEpqwN5oy1 ApMIorfxbRAUsoHZUwQVakDSNmgY8uA8jd+bsEz062baVe7FlygbUgdebcqQg0ll9IEkz82hfvp+V BeCjK0NUqqnFSxKBA8cyebfgU9d3MKBeTKmiuIgYOz7SZduwFnMfJl0bCay6Y/eJfsxjTzDD7cXIq DVnK+Fc6nuZaQuTVYUdvTtE7rGH9TqCxmEy3ipM9tWh4JfV2ORj4i9VHf0RR7LWu9dtuxkBUbzi0i A1c1+uEw==; 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 1f0kpy-0004Ci-GN; Tue, 27 Mar 2018 09:24:14 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f0kmj-0001et-PO for linux-arm-kernel@lists.infradead.org; Tue, 27 Mar 2018 09:20:56 +0000 Received: by mail-wr0-x241.google.com with SMTP id z73so21659986wrb.0 for ; Tue, 27 Mar 2018 02:20:46 -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=bxYahFQx3XoeG5bMbnub7b0Bflb9wg52zn23L5bL7k4=; b=GDgGDpYE4mP9ZGAbpURzeqeIUTAKjoI8ateq3q9suXKY56uFKVkOIxJlqKVmddBaMg ssuGiBjrmoz4b2Dg6CNOOWm/Nyg5AANwz++vmeKoHpsqCDH8y5e5tm4kJW4u0MK1LE3f K1WM55LFYRwmdWzAueJAZtGhJUrmb9XKxo6ogJr09QQyu9dtcYNInu3hWRu0qRJADdtJ qirqrmIFsF14qxvz0GrTbYwu19+RZJevKE0QttWz+aTIDy7TgKZJ/6kXKJo/9siHR5mQ 8ZO8VKniuuqEY9h/x1OAmAD5871cmDOIVMpAYm5/1jZRzlCXnEuU4B40LmnrsWq/NsVl StjQ== 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=bxYahFQx3XoeG5bMbnub7b0Bflb9wg52zn23L5bL7k4=; b=KPChOQIxYe1KpRZACZDrcApnm/T2yiHG4P/WY9rFXiHieFpzdZQxDHvFWiQ1mKssSe hLVQDqNyVhbgFpZP8VdvMRc9yYcSMWRetEXZV4gtAzwIiGVRPaLc9I8dv4Ydtx6Epax8 dbAQmp8HnlqrzP1FQC25szYn0YrgimbWZ63pQr1iLtyZRhiZtxkUW3OLPoVMWvxvq19i IPWcss35stK8kOQ2VS0YnxEE01730ygKq4lcp+3sOZKJJVkEoCHrfjubcA6pglASrVlX 40BZzIkJ1ZxqQFEOjeENL/IJ44j2gM8Q7P+GaNa0xFy3PPBTyqGu3jRHs2ZzFDj1YDMK OR7w== X-Gm-Message-State: AElRT7EBw4g1lnX+J5esK6dj6zy6y2kYyCdkVYKV91lk5t0vvH8rkVil yDRNqJTJnD0yTXG1V2attffRdw== X-Google-Smtp-Source: AG47ELv7GM2o3uz5bOkLAS91C7IDnMPd5OmfFGaTeG4qou4KztXoTlfihegnJH7TLkX/CZSKloSYsQ== X-Received: by 10.223.134.210 with SMTP id 18mr36730693wry.232.1522142444918; Tue, 27 Mar 2018 02:20:44 -0700 (PDT) Received: from brgl-bgdev.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h190sm1288925wmd.22.2018.03.27.02.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 02:20:44 -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 v3 7/8] remoteproc/davinci: use the reset framework Date: Tue, 27 Mar 2018 11:20:30 +0200 Message-Id: <20180327092031.11251-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180327092031.11251-1-brgl@bgdev.pl> References: <20180327092031.11251-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180327_022053_848860_1DE382DF X-CRM114-Status: GOOD ( 19.32 ) 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 | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index b668e32996e2..788f59809c02 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) { @@ -309,7 +332,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;