From patchwork Sun Jan 20 01:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10772247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6649E746 for ; Sun, 20 Jan 2019 01:59:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FFF62A945 for ; Sun, 20 Jan 2019 01:59:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 422362A947; Sun, 20 Jan 2019 01:59:46 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham 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 D3C382A945 for ; Sun, 20 Jan 2019 01:59:45 +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=rfl3zNON+onmSKlnKfMBDeAJtGJw+9Yb0T+qW7I/qeQ=; b=Yb91lIXBIrfwOxlCetZJCK4NXk C2uG5uDephY0OlAM9miMxF7AzXRiuSFLouXzstssP9YV0fGPHcrsdwlwktvOuR9Z6TBBbiehV/rg4 pMCyesEhHAmx+y9j+WwhRt0WZ1x+nGiBGN1fJsveLoMQU457OwvsjBu+v12a/hQ5J8Vcnt2dYfZKu 7nLnrS8A4XQ1GC7qKXMBRejHstJumFNpC6EGtwFSkyK0pPQDLMiEmYI8NGGeHHIKLpd81VppCitQM s70eVyCnENONgcFfM0vi15e3JlSPWL0CD681GOdtVr6cq12xTlBJcl7OOgGMj+ArvCjwkPnm8Kpb0 Cg6YV/sQ==; 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 1gl2Ok-00082J-OB; Sun, 20 Jan 2019 01:59:42 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gl2OB-0007XU-Ks for linux-arm-kernel@lists.infradead.org; Sun, 20 Jan 2019 01:59:09 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 6AB5A4E2051; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7q5NT6QLraNd; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 91C8D4E204D; Sun, 20 Jan 2019 01:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=wxj4KQZd68U4CteRg0LBuiQpkZAAQQhF+vq81skObRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ojK+jmY84YyQYcxCHDRCg5LVJr2eIuuenKTQC8ndf4Am9brlHWNjclzDyrjPrlwPQ 5qj+WLPgY0Skzu0OY9qtMB8oMV7hc9cdN0KTsGMbU6LliwYwrHRkHo6aIG9Q7aMFb5 nGUVHFZogUlMXfAesHgWSdj5lT/o/hmSt1ea+6JE= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH 1/3] dma: imx-sdma: fix NULL pointer de-reference Date: Sat, 19 Jan 2019 18:58:49 -0700 Message-Id: <20190120015851.11797-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120015851.11797-1-angus@akkea.ca> References: <20190120015851.11797-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_175907_688723_1822CE5C X-CRM114-Status: GOOD ( 10.78 ) 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: linux-kernel@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , dmaengine@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 On the imx8mq I get NULL pointer de-deference errors if the device isn't passed in during allocation. Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 86708fb9bda1..064bc50d1e99 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -677,7 +677,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, int ret; unsigned long flags; - buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL); + buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL); if (!buf_virt) { return -ENOMEM; } @@ -696,7 +696,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size, spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - dma_free_coherent(NULL, size, buf_virt, buf_phys); + dma_free_coherent(sdma->dev, size, buf_virt, buf_phys); return ret; } @@ -1182,8 +1182,8 @@ static int sdma_request_channel0(struct sdma_engine *sdma) { int ret = -EBUSY; - sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys, - GFP_NOWAIT); + sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys, + GFP_NOWAIT); if (!sdma->bd0) { ret = -ENOMEM; goto out; @@ -1205,8 +1205,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc) u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); int ret = 0; - desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys, - GFP_NOWAIT); + desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size, + &desc->bd_phys, GFP_NOWAIT); if (!desc->bd) { ret = -ENOMEM; goto out; @@ -1219,7 +1219,8 @@ static void sdma_free_bd(struct sdma_desc *desc) { u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor); - dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys); + dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd, + desc->bd_phys); } static void sdma_desc_free(struct virt_dma_desc *vd) @@ -1842,7 +1843,7 @@ static int sdma_init(struct sdma_engine *sdma) /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); - sdma->channel_control = dma_alloc_coherent(NULL, + sdma->channel_control = dma_alloc_coherent(sdma->dev, MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) + sizeof(struct sdma_context_data), &ccb_phys, GFP_KERNEL); From patchwork Sun Jan 20 01:58:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10772245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF643746 for ; Sun, 20 Jan 2019 01:59:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB72C2A945 for ; Sun, 20 Jan 2019 01:59:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC34B2A947; Sun, 20 Jan 2019 01:59:23 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham 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 569342A945 for ; Sun, 20 Jan 2019 01:59:23 +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=j0ai64kif9eXO5U3Mc+p1xUpbVmOGgV6CnPWG4khCgk=; b=kBYvvJ8KYg+zzJPHsua/PA6G72 v/+Ttn6/A3Jt8Zot6sn06jh32+j+BLT7UDbEJwzMhoMPyvVy27nZwLeUKkyvN2ZQAG6ibDmg5cMod aL6rrN2xvUYahAyVDYlHNYym23Roba80HEHLgkjBlabL/6DcmeQPard53hmwy7BZ+EIS6NYJ/wxhg VV/OKcSxmtZPoT4LEEiSCdgCfECMv1lLv3lzF7/4SX4klV7vKNoeBJRBPCGbpRF73vb+nr6FqI8wb O2VcMOZqN2YckrJZG9VysNcwrGhKfyP69ijeaYUdBk4afpDKAA9wFm77LbdOvsiTFw5os5fVjqnBH qyZ8HRKg==; 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 1gl2ON-0007gu-O5; Sun, 20 Jan 2019 01:59:19 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gl2OA-0007Wu-UX for linux-arm-kernel@lists.infradead.org; Sun, 20 Jan 2019 01:59:08 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 0029B4E2056; Sun, 20 Jan 2019 01:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949543; bh=T9HlXba0+O7OmEWuOjckmfDYbcBpmtTFupSoqCaa3Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RyZHWaNszzGdqNPjOIs6gz2Oxr/tdrw9knFCnkXUTEXAR+yrVXxO6dpwxhmJuDyAG y3tWxBTSIatLctgziF0g09GAkNNkzMk8V0PD3B5X7sEVsxLxw7l1WCqMgQowGr+w/s nPvicW5Ab8v/04jmClIG2x+K/6lHbenspkK6eCSs= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1EWjpHtaOxpq; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 2D80A4E204B; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949542; bh=T9HlXba0+O7OmEWuOjckmfDYbcBpmtTFupSoqCaa3Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YE86T+MGlUJNLKd3TGJpPmdq/5W7cdQ7z4B9Nixc09qTSOxwcNqYU86ZOy0+vI3Cw GfNcNpBCR8FeD60qX4kMtyD7TqF0sFbBxaV8Fsh6B8p4S8qnasiRhk7SCHw7HC8ZZX AXmBut6mpRqXUp6+M0ZcyDYq8nlSeUfprUUHaxsA= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH 2/3] dma: imx-sdma: add clock ratio 1:1 check Date: Sat, 19 Jan 2019 18:58:50 -0700 Message-Id: <20190120015851.11797-3-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120015851.11797-1-angus@akkea.ca> References: <20190120015851.11797-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_175907_026732_E733FB04 X-CRM114-Status: GOOD ( 12.36 ) 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: linux-kernel@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , dmaengine@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 On i.mx8 mscale B0 chip, AHB/SDMA clock ratio 2:1 can't be supportted, since SDMA clock ratio has to be increased to 250Mhz, AHB can't reach to 500Mhz, so use 1:1 instead. based on NXP commit MLK-16841-1 Signed-off-by: Angus Ainslie (Purism) --- .../devicetree/bindings/dma/fsl-imx-sdma.txt | 2 +- drivers/dma/imx-sdma.c | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index 3c9a57a8443b..b3fbac401bd0 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -67,7 +67,7 @@ Optional properties: reg is the GPR register offset. shift is the bit position inside the GPR register. val is the value of the bit (0 or 1). - +- fsl,ratio-1-1: AHB/SDMA core clock ration 1:1, 2:1 without this. Examples: sdma@83fb0000 { diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 064bc50d1e99..616ffd6b301e 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -440,6 +440,8 @@ struct sdma_engine { unsigned int irq; dma_addr_t bd0_phys; struct sdma_buffer_descriptor *bd0; + /* clock ratio for AHB:SDMA core. 1:1 is 1, 2:1 is 0*/ + bool clk_ratio; }; static int sdma_config_write(struct dma_chan *chan, @@ -662,8 +664,14 @@ static int sdma_run_channel0(struct sdma_engine *sdma) dev_err(sdma->dev, "Timeout waiting for CH0 ready\n"); /* Set bits of CONFIG register with dynamic context switching */ - if (readl(sdma->regs + SDMA_H_CONFIG) == 0) - writel_relaxed(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG); + if (readl(sdma->regs + SDMA_H_CONFIG) == 0) { + if (sdma->clk_ratio) + reg = SDMA_H_CONFIG_CSM | SDMA_H_CONFIG_ACR; + else + reg = SDMA_H_CONFIG_CSM; + + writel_relaxed(reg, sdma->regs + SDMA_H_CONFIG); + } return ret; } @@ -1880,8 +1888,10 @@ static int sdma_init(struct sdma_engine *sdma) writel_relaxed(0x4050, sdma->regs + SDMA_CHN0ADDR); /* Set bits of CONFIG register but with static context switching */ - /* FIXME: Check whether to set ACR bit depending on clock ratios */ - writel_relaxed(0, sdma->regs + SDMA_H_CONFIG); + if (sdma->clk_ratio) + writel_relaxed(SDMA_H_CONFIG_ACR, sdma->regs + SDMA_H_CONFIG); + else + writel_relaxed(0, sdma->regs + SDMA_H_CONFIG); writel_relaxed(ccb_phys, sdma->regs + SDMA_H_C0PTR); @@ -1975,6 +1985,8 @@ static int sdma_probe(struct platform_device *pdev) if (!sdma) return -ENOMEM; + sdma->clk_ratio = of_property_read_bool(np, "fsl,ratio-1-1"); + spin_lock_init(&sdma->channel_0_lock); sdma->dev = &pdev->dev; From patchwork Sun Jan 20 01:58:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10772249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC2DF746 for ; Sun, 20 Jan 2019 01:59:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9915B2A945 for ; Sun, 20 Jan 2019 01:59:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D7A12A947; Sun, 20 Jan 2019 01:59:58 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham 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 3AAE22A945 for ; Sun, 20 Jan 2019 01:59:58 +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=hBos4b/clYIxTpPMNwal5bfKplyBQZ1Z0IT2iK9eUbI=; b=MUuddyB08S5XVign5oawkBtitM MUtQzZTdqYuJ2G7YMSr/Os/7tIXer3OsvTE4k+MgsdyO87auE22hTz9m+kLcXbfeRpkcKRxwLvIbT p9A9H72PGHzHJCf6KLwt/iv6MO6rq+yf/EJcwBkk8uT7xbSmkOQQ+JM4yfwT2SAjKBdPEaVnWwBtN 7kdmi3d0JDxzQW2ClfhWO7Olt4sL7E1o49GIUAhDc8fNFCpLAHTw8gmAb2SJaKEYyyRQa3RcoL8sZ b9HRpwqEncE7W63ry4Z96EVPoMsy6kGvwDX/Dhp0qJj2IDLG2TK+OTmJ7bN5hSjLDNZTIqboa+R9p nnLoWoiQ==; 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 1gl2Ox-0008DV-0G; Sun, 20 Jan 2019 01:59:55 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gl2OB-0007Wo-9m for linux-arm-kernel@lists.infradead.org; Sun, 20 Jan 2019 01:59:10 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 8A1244E204E; Sun, 20 Jan 2019 01:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949543; bh=JfVOWgR5QuG6tpKoIHNNbXibSECl7RMA1pHlN2DEzyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gDLKuQarzZ3TIRJsr40nKxkhOmoMFbbIQZvaVqg10UNmuhUA5Vn7HGVZQaKcezFuS fLLX/fmaNlYULes0zS3pURJZkGQ0KVQ4E6TVrXTX1rFJRQg9YUYiMDrIbjNJRPjX2v ryOx31lAo19tslYj+QRJ61kU66/Nbbaj30Z84gc8= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tWVVph7veH1K; Sun, 20 Jan 2019 01:59:03 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id BF9704E204D; Sun, 20 Jan 2019 01:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1547949543; bh=JfVOWgR5QuG6tpKoIHNNbXibSECl7RMA1pHlN2DEzyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gDLKuQarzZ3TIRJsr40nKxkhOmoMFbbIQZvaVqg10UNmuhUA5Vn7HGVZQaKcezFuS fLLX/fmaNlYULes0zS3pURJZkGQ0KVQ4E6TVrXTX1rFJRQg9YUYiMDrIbjNJRPjX2v ryOx31lAo19tslYj+QRJ61kU66/Nbbaj30Z84gc8= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH 3/3] imx8mq.dtsi: add the sdma nodes Date: Sat, 19 Jan 2019 18:58:51 -0700 Message-Id: <20190120015851.11797-4-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190120015851.11797-1-angus@akkea.ca> References: <20190120015851.11797-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_175907_348754_CD1146CF X-CRM114-Status: UNSURE ( 9.63 ) X-CRM114-Notice: Please train this message. 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: linux-kernel@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , dmaengine@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 Add the sdma nodes to the base devicetree for the imx8mq Signed-off-by: Angus Ainslie (Purism) --- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index c0402375e7c1..0b9a9b5ae7b7 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -336,6 +336,19 @@ clocks = <&clk IMX8MQ_CLK_WDOG3_ROOT>; status = "disabled"; }; + + sdma2: sdma@302c0000 { + compatible = "fsl,imx8mq-sdma", "fsl,imx7d-sdma"; + reg = <0x302c0000 0x10000>; + interrupts = ; + clocks = <&clk IMX8MQ_CLK_SDMA2_ROOT>, + <&clk IMX8MQ_CLK_SDMA2_ROOT>; + clock-names = "ipg", "ahb"; + #dma-cells = <3>; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin"; + fsl,ratio-1-1; + status = "disabled"; + }; }; bus@30400000 { /* AIPS2 */ @@ -370,6 +383,8 @@ clocks = <&clk IMX8MQ_CLK_UART3_ROOT>, <&clk IMX8MQ_CLK_UART3_ROOT>; clock-names = "ipg", "per"; + dmas = <&sdma1 26 4 0>, <&sdma1 27 4 0>; + dma-names = "rx", "tx"; status = "disabled"; }; @@ -381,6 +396,8 @@ clocks = <&clk IMX8MQ_CLK_UART2_ROOT>, <&clk IMX8MQ_CLK_UART2_ROOT>; clock-names = "ipg", "per"; + dmas = <&sdma1 24 4 0>, <&sdma1 25 4 0>; + dma-names = "rx", "tx"; status = "disabled"; }; @@ -432,6 +449,8 @@ clocks = <&clk IMX8MQ_CLK_UART4_ROOT>, <&clk IMX8MQ_CLK_UART4_ROOT>; clock-names = "ipg", "per"; + dmas = <&sdma1 28 4 0>, <&sdma1 29 4 0>; + dma-names = "rx", "tx"; status = "disabled"; }; @@ -465,6 +484,18 @@ status = "disabled"; }; + sdma1: sdma@30bd0000 { + compatible = "fsl,imx8mq-sdma", "fsl,imx7d-sdma"; + reg = <0x30bd0000 0x10000>; + interrupts = ; + clocks = <&clk IMX8MQ_CLK_SDMA1_ROOT>, + <&clk IMX8MQ_CLK_SDMA1_ROOT>; + clock-names = "ipg", "ahb"; + #dma-cells = <3>; + fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin"; + status = "disabled"; + }; + fec1: ethernet@30be0000 { compatible = "fsl,imx8mq-fec", "fsl,imx6sx-fec"; reg = <0x30be0000 0x10000>;