From patchwork Tue Aug 1 15:48:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 109187 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp1664819qge; Tue, 1 Aug 2017 08:55:01 -0700 (PDT) X-Received: by 10.98.48.69 with SMTP id w66mr19932655pfw.214.1501602901168; Tue, 01 Aug 2017 08:55:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501602901; cv=none; d=google.com; s=arc-20160816; b=blKSi6IdKbf/7dXvP26q4l/mWdMFwsCENYBhh39MdvwbSivFtG8Ue9dUIKMQjALWcG kCCMCzkBckhmlCv93oQS1KQy3Ke9n4Kedfs1QCgYJDIF5uoJSZQZMNRVKxvOCskpziP/ sirwaXtXaHN14QwPZZxM8BoS6LHMPBMAKc573E9/KTUnK6FR5clpSRUgsIrTCBIjAuTm bhvH9FKsAjTIEbnk7Wj3BS0Lmy3Nn5x3lNNjP3Jc5s/1+vIRGicA+wVfpPvrBtB7F5ac cwKdPb764Gb9yBBQo1vKQMyE9U4ipBnHFUAJg5aqqO89DSHdyu5EsC3gO2RqPIAHWq2W XDOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=FgBgvrqLtoxz0QxVmUQ67Plw7ct4vHYQB+imrZcWvqA=; b=clWvWzKNhD3xMhd6KD7NQ3k1iATkg1ul4fdwlU9NYIWl2iEtLC6Xj3c4Mt0jKGHAsF ZrH7UEMo/B5NAIfYl6753ugvnjy24LlLbpjPIPEfsslPm0sB3MXLBZROoSUINhYJNQuT RhTFdLLgZ8/4yTHTBUtYidGbOKrtbtPRobz13kt82DvJ0WYV2n3HfqqRPOoAPmYUS34I uX+c56G4kyjzbncAcESk9nHnIKnM9WzXmBA9ZgayJb1Wm38V7kAqqPu2vok9tAmFYB5x jOGJBQwu728b2gPVUZmgmsqDHJjyWpL3hUi9SwFdymzNAdIoys/Dg9YuaNe83kmp+Bsu gQVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.b=w4XnQOeB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g28si18087042pfe.534.2017.08.01.08.55.00; Tue, 01 Aug 2017 08:55:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.b=w4XnQOeB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751956AbdHAPv7 (ORCPT + 26 others); Tue, 1 Aug 2017 11:51:59 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:54308 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750AbdHAPu0 (ORCPT ); Tue, 1 Aug 2017 11:50:26 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v71Fms5I005506; Tue, 1 Aug 2017 10:48:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1501602534; bh=2KV56TowcDecn4g0osYA/I8GsRcOA75fER/8blCjUeo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=w4XnQOeBa1q9Nq4UgtpRJ8aPu1mdiGCvi3RFYY6AbWJe57TBDzo72tCmyvgbHTOXb vH/BWjrISvRWQqR/noBF3bP2SMd60b4DSBc2VrDNw4/ISGCLEafu05imlhnEiYzNA3 MWd2g4hjV8bExb5qV8ABY3mTMYsA5yqlBkhnfKFc= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v71FmnXN029864; Tue, 1 Aug 2017 10:48:49 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Tue, 1 Aug 2017 10:48:48 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v71Fmm5l008467; Tue, 1 Aug 2017 10:48:48 -0500 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id v71Fmm323830; Tue, 1 Aug 2017 10:48:48 -0500 (CDT) From: Suman Anna To: Bjorn Andersson , Ohad Ben-Cohen , Rob Herring CC: Mark Rutland , , , Sekhar Nori , Robert Tivy , , , Suman Anna Subject: [PATCH v2 4/4] remoteproc/davinci: Add device tree support for OMAP-L138 DSP Date: Tue, 1 Aug 2017 10:48:44 -0500 Message-ID: <20170801154844.24662-5-s-anna@ti.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170801154844.24662-1-s-anna@ti.com> References: <20170801154844.24662-1-s-anna@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Davinci remoteproc driver currently supports the DSP remoteproc device created in legacy-style on OMAP-L13x SoCs. The driver has been enhanced to support the DSP remoteproc device created through Device Tree now. The current DT support handles the C674x DSP processor subsystem on OMAP-L138 SoCs. Signed-off-by: Suman Anna --- v2: - Add __maybe_unused and of_match_ptr to deal with non-OF builds - Rebased patch after dropping the interrupt management patch from the cleanup series, https://patchwork.kernel.org/patch/9735321/ v1: https://patchwork.kernel.org/patch/9751277/ drivers/remoteproc/da8xx_remoteproc.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) -- 2.13.1 diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index c1cff78de67b..bf3b9034c319 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -261,10 +262,21 @@ static int da8xx_rproc_probe(struct platform_device *pdev) return PTR_ERR(dsp_clk); } + if (dev->of_node) { + ret = of_reserved_mem_device_init(dev); + if (ret) { + dev_err(dev, "device does not have specific CMA pool: %d\n", + ret); + return ret; + } + } + rproc = rproc_alloc(dev, "dsp", &da8xx_rproc_ops, da8xx_fw_name, sizeof(*drproc)); - if (!rproc) - return -ENOMEM; + if (!rproc) { + ret = -ENOMEM; + goto free_mem; + } drproc = rproc->priv; drproc->rproc = rproc; @@ -311,7 +323,9 @@ static int da8xx_rproc_probe(struct platform_device *pdev) free_rproc: rproc_free(rproc); - +free_mem: + if (dev->of_node) + of_reserved_mem_device_release(dev); return ret; } @@ -319,6 +333,7 @@ static int da8xx_rproc_remove(struct platform_device *pdev) { struct rproc *rproc = platform_get_drvdata(pdev); struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv; + struct device *dev = &pdev->dev; /* * The devm subsystem might end up releasing things before @@ -329,15 +344,24 @@ static int da8xx_rproc_remove(struct platform_device *pdev) rproc_del(rproc); rproc_free(rproc); + if (dev->of_node) + of_reserved_mem_device_release(dev); return 0; } +static const struct of_device_id davinci_rproc_of_match[] __maybe_unused = { + { .compatible = "ti,da850-dsp", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, davinci_rproc_of_match); + static struct platform_driver da8xx_rproc_driver = { .probe = da8xx_rproc_probe, .remove = da8xx_rproc_remove, .driver = { .name = "davinci-rproc", + .of_match_table = of_match_ptr(davinci_rproc_of_match), }, };