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: 9874881 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 5425760361 for ; Tue, 1 Aug 2017 15:50:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44735209D8 for ; Tue, 1 Aug 2017 15:50:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3984B286DA; Tue, 1 Aug 2017 15:50:36 +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,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 A2F90209D8 for ; Tue, 1 Aug 2017 15:50:35 +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: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=nM42TIzP0rKA/F5gAuuyYX5HRIdGyFkcy63FXFI3fvo=; b=Rc+yZgybnVujW1 7I4iEdXsqmc0DbXwDZ5MjDgdyqu9no5aHEGp27bHhXRje6VqIMkcKbjxs7Oee/Wz1QU1sLeBk/lCm 4UFmZeFOklV6QKh9tlXc3DpDBZ2rbnqvk/j+F3nWzrjoFndBTIRcNWpPL0635c4nUTJpecoYJRCKS tCo0QuNqga7kcXdLbe3QTFrt9ZHG8eLd8KpHJes43ejLjfC+19YOsNEuPJ9vfu6bJtMSJMCrxxs9v dZQlMFJQpSIVdz4eTzLcCHVpn36ecFmF+3tPjXYz5YCvKUIMxYjRltwpPq+DHJbHsosyk2+KLOdES uQxuK7nRBAp8AqMWdTiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcZRG-0002Rz-S7; Tue, 01 Aug 2017 15:50:30 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcZR3-00020t-26 for linux-arm-kernel@bombadil.infradead.org; Tue, 01 Aug 2017 15:50:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding: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=FgBgvrqLtoxz0QxVmUQ67Plw7ct4vHYQB+imrZcWvqA=; b=idkhoKjNabnzUMIou9BgmZJqC hcsPaaHETheY6VIF5AgeNkuVpA8Sn4SWoLclyLIuJLV13VDJGjeNG1gGJGLpG0u16TbWBNRNQAal6 efc2dqp8trxY8HbQ6xtUwDdNeQLGUZG5c+FtlSGewg7qFUsFf5qzwRvOdCWB1a+Sq+zPch9+YXxxk 3c67rej4Uy656g4r+Je+LMrq92sDJ9cKegM61Q3/wTwjMKFGwJpL9ytbGPOu02Q7iZtJGELnDf+73 Sijdz6idHKNjv3YLk/1WRxA2wDrMqJslR3n5n2gOvlgy3Cd7/ymS9cKVTU0QAEdptQRRJU5lMpuHu L01DGDYsA==; Received: from fllnx209.ext.ti.com ([198.47.19.16]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcZQz-0006Re-1D for linux-arm-kernel@lists.infradead.org; Tue, 01 Aug 2017 15:50:15 +0000 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170801_165013_353275_D829BDF4 X-CRM114-Status: GOOD ( 17.90 ) 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: Mark Rutland , devicetree@vger.kernel.org, Robert Tivy , Sekhar Nori , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 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(-) 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), }, };