From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v3,1/5] dma: imx-sdma: add clock ratio 1:1 check From: Angus Ainslie Message-Id: <20190123152310.11680-2-angus@akkea.ca> Date: Wed, 23 Jan 2019 08:23:06 -0700 To: angus@akkea.ca Cc: angus.ainslie@puri.sm, Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Lucas Stach , Daniel Baluta List-ID: T24gaS5teDggbXNjYWxlIEIwIGNoaXAsIEFIQi9TRE1BIGNsb2NrIHJhdGlvIDI6MSBjYW4ndCBi ZSBzdXBwb3J0dGVkLApzaW5jZSBTRE1BIGNsb2NrIHJhdGlvIGhhcyB0byBiZSBpbmNyZWFzZWQg dG8gMjUwTWh6LCBBSEIgY2FuJ3QgcmVhY2gKdG8gNTAwTWh6LCBzbyB1c2UgMToxIGluc3RlYWQu CgpCYXNlZCBvbiBOWFAgY29tbWl0IE1MSy0xNjg0MS0xIGJ5IFJvYmluIEdvbmcgPHlpYmluLmdv bmdAbnhwLmNvbT4KClNpZ25lZC1vZmYtYnk6IEFuZ3VzIEFpbnNsaWUgKFB1cmlzbSkgPGFuZ3Vz QGFra2VhLmNhPgotLS0KIGRyaXZlcnMvZG1hL2lteC1zZG1hLmMgfCAyMyArKysrKysrKysrKysr KysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEvaW14LXNkbWEuYyBiL2RyaXZlcnMvZG1hL2lt eC1zZG1hLmMKaW5kZXggMGIzYTY3ZmY4ZTgyLi41MzFhOWQ4YjAzMmEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZG1hL2lteC1zZG1hLmMKKysrIGIvZHJpdmVycy9kbWEvaW14LXNkbWEuYwpAQCAtNDQw LDYgKzQ0MCw4IEBAIHN0cnVjdCBzZG1hX2VuZ2luZSB7CiAJdW5zaWduZWQgaW50CQkJaXJxOwog CWRtYV9hZGRyX3QJCQliZDBfcGh5czsKIAlzdHJ1Y3Qgc2RtYV9idWZmZXJfZGVzY3JpcHRvcgkq YmQwOworCS8qIGNsb2NrIHJhdGlvIGZvciBBSEI6U0RNQSBjb3JlLiAxOjEgaXMgMSwgMjoxIGlz IDAqLworCWJvb2wJCQkJY2xrX3JhdGlvOwogfTsKIAogc3RhdGljIGludCBzZG1hX2NvbmZpZ193 cml0ZShzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sCkBAIC02NjIsOCArNjY0LDE0IEBAIHN0YXRpYyBp bnQgc2RtYV9ydW5fY2hhbm5lbDAoc3RydWN0IHNkbWFfZW5naW5lICpzZG1hKQogCQlkZXZfZXJy KHNkbWEtPmRldiwgIlRpbWVvdXQgd2FpdGluZyBmb3IgQ0gwIHJlYWR5XG4iKTsKIAogCS8qIFNl dCBiaXRzIG9mIENPTkZJRyByZWdpc3RlciB3aXRoIGR5bmFtaWMgY29udGV4dCBzd2l0Y2hpbmcg Ki8KLQlpZiAocmVhZGwoc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpID09IDApCi0JCXdyaXRl bF9yZWxheGVkKFNETUFfSF9DT05GSUdfQ1NNLCBzZG1hLT5yZWdzICsgU0RNQV9IX0NPTkZJRyk7 CisJaWYgKHJlYWRsKHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKSA9PSAwKSB7CisJCWlmIChz ZG1hLT5jbGtfcmF0aW8pCisJCQlyZWcgPSBTRE1BX0hfQ09ORklHX0NTTSB8IFNETUFfSF9DT05G SUdfQUNSOworCQllbHNlCisJCQlyZWcgPSBTRE1BX0hfQ09ORklHX0NTTTsKKworCQl3cml0ZWxf cmVsYXhlZChyZWcsIHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKTsKKwl9CiAKIAlyZXR1cm4g cmV0OwogfQpAQCAtMTg0MCw2ICsxODQ4LDExIEBAIHN0YXRpYyBpbnQgc2RtYV9pbml0KHN0cnVj dCBzZG1hX2VuZ2luZSAqc2RtYSkKIAlpZiAocmV0KQogCQlnb3RvIGRpc2FibGVfY2xrX2lwZzsK IAorCWlmIChjbGtfZ2V0X3JhdGUoc2RtYS0+Y2xrX2FoYikgPT0gY2xrX2dldF9yYXRlKHNkbWEt PmNsa19pcGcpKQorCQlzZG1hLT5jbGtfcmF0aW8gPSAxOworCWVsc2UKKwkJc2RtYS0+Y2xrX3Jh dGlvID0gMDsKKwogCS8qIEJlIHN1cmUgU0RNQSBoYXMgbm90IHN0YXJ0ZWQgeWV0ICovCiAJd3Jp dGVsX3JlbGF4ZWQoMCwgc2RtYS0+cmVncyArIFNETUFfSF9DMFBUUik7CiAKQEAgLTE4ODAsOCAr MTg5MywxMCBAQCBzdGF0aWMgaW50IHNkbWFfaW5pdChzdHJ1Y3Qgc2RtYV9lbmdpbmUgKnNkbWEp CiAJd3JpdGVsX3JlbGF4ZWQoMHg0MDUwLCBzZG1hLT5yZWdzICsgU0RNQV9DSE4wQUREUik7CiAK IAkvKiBTZXQgYml0cyBvZiBDT05GSUcgcmVnaXN0ZXIgYnV0IHdpdGggc3RhdGljIGNvbnRleHQg c3dpdGNoaW5nICovCi0JLyogRklYTUU6IENoZWNrIHdoZXRoZXIgdG8gc2V0IEFDUiBiaXQgZGVw ZW5kaW5nIG9uIGNsb2NrIHJhdGlvcyAqLwotCXdyaXRlbF9yZWxheGVkKDAsIHNkbWEtPnJlZ3Mg KyBTRE1BX0hfQ09ORklHKTsKKwlpZiAoc2RtYS0+Y2xrX3JhdGlvKQorCQl3cml0ZWxfcmVsYXhl ZChTRE1BX0hfQ09ORklHX0FDUiwgc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpOworCWVsc2UK KwkJd3JpdGVsX3JlbGF4ZWQoMCwgc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpOwogCiAJd3Jp dGVsX3JlbGF4ZWQoY2NiX3BoeXMsIHNkbWEtPnJlZ3MgKyBTRE1BX0hfQzBQVFIpOwogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE90C282C0 for ; Wed, 23 Jan 2019 15:24:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0973920861 for ; Wed, 23 Jan 2019 15:24:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="enZOjowf"; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="enZOjowf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726398AbfAWPYO (ORCPT ); Wed, 23 Jan 2019 10:24:14 -0500 Received: from node.akkea.ca ([192.155.83.177]:52712 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfAWPXo (ORCPT ); Wed, 23 Jan 2019 10:23:44 -0500 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 7B0B64E2051; Wed, 23 Jan 2019 15:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548257024; bh=KZCd8IffuRMl9Nip/zTd4SZ7MCwn2I9xxnuDi2j9ml8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=enZOjowfExCEkzbJAg8dYHxl0dm21LAZojNilqPkyhVc/7d0JzJU2kdZ02Fk6XBWN WLpTzAED5rpausR+n+FJXmMwknlbcAw1Ie9j3ZTU+JrQvANMmaCJ41ay/2PjpMG4jk rxeN9ETwSWR3wtXUqJUHMmnr+o4DkJU0oktqPvyU= 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 g4tSeW51Jd3F; Wed, 23 Jan 2019 15:23:44 +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 782CB4E204D; Wed, 23 Jan 2019 15:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548257024; bh=KZCd8IffuRMl9Nip/zTd4SZ7MCwn2I9xxnuDi2j9ml8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=enZOjowfExCEkzbJAg8dYHxl0dm21LAZojNilqPkyhVc/7d0JzJU2kdZ02Fk6XBWN WLpTzAED5rpausR+n+FJXmMwknlbcAw1Ie9j3ZTU+JrQvANMmaCJ41ay/2PjpMG4jk rxeN9ETwSWR3wtXUqJUHMmnr+o4DkJU0oktqPvyU= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Cc: angus.ainslie@puri.sm, Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Lucas Stach , Daniel Baluta Subject: [PATCH v3 1/5] dma: imx-sdma: add clock ratio 1:1 check Date: Wed, 23 Jan 2019 08:23:06 -0700 Message-Id: <20190123152310.11680-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123152310.11680-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190123152310.11680-1-angus@akkea.ca> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 by Robin Gong Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0b3a67ff8e82..531a9d8b032a 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; } @@ -1840,6 +1848,11 @@ static int sdma_init(struct sdma_engine *sdma) if (ret) goto disable_clk_ipg; + if (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg)) + sdma->clk_ratio = 1; + else + sdma->clk_ratio = 0; + /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); @@ -1880,8 +1893,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); -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCF2FC282C0 for ; Wed, 23 Jan 2019 15:24:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABA7621850 for ; Wed, 23 Jan 2019 15:24:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bnJ20qlW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="enZOjowf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="enZOjowf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABA7621850 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=akkea.ca Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=Yu6EpTmWkC/cPwmt1P2BgKk1DX203xc/j9NyxKC3xIo=; b=bnJ20qlWQvtQos+aRYsRx3U4qy aVo8y/xBOraoTXDgIsy9/oBzDaRw5iVAc3OsJQcCkvX4AVwb/NWa1QKku6bn0NPs3K/jf69OHmeb3 Ar8xpPcVf59rc4yQWCegos1CyVx50NJ1jfxq78kE2sat0zpKl+EtnDVJLgb22ibUV4ycpjo1E/M44 gCMaB4INPahSDutjKRMLr/klCkMHeo9PMGzjH+A2yZze4XDf/94+mnG5fl2aV+YSXdvBYDBcxCzB8 G1EZi33EtXAGSgBws1drtlE+261mxDRRJMJHs+dtWQDHFmNv/LwmylYm2DSQrYa+T3sJ+vEz0FVxL BVcpLvkg==; 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 1gmKOD-0000kD-2Z; Wed, 23 Jan 2019 15:24:29 +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 1gmKNW-00005Q-Ig for linux-arm-kernel@lists.infradead.org; Wed, 23 Jan 2019 15:23:49 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 7B0B64E2051; Wed, 23 Jan 2019 15:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548257024; bh=KZCd8IffuRMl9Nip/zTd4SZ7MCwn2I9xxnuDi2j9ml8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=enZOjowfExCEkzbJAg8dYHxl0dm21LAZojNilqPkyhVc/7d0JzJU2kdZ02Fk6XBWN WLpTzAED5rpausR+n+FJXmMwknlbcAw1Ie9j3ZTU+JrQvANMmaCJ41ay/2PjpMG4jk rxeN9ETwSWR3wtXUqJUHMmnr+o4DkJU0oktqPvyU= 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 g4tSeW51Jd3F; Wed, 23 Jan 2019 15:23:44 +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 782CB4E204D; Wed, 23 Jan 2019 15:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548257024; bh=KZCd8IffuRMl9Nip/zTd4SZ7MCwn2I9xxnuDi2j9ml8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=enZOjowfExCEkzbJAg8dYHxl0dm21LAZojNilqPkyhVc/7d0JzJU2kdZ02Fk6XBWN WLpTzAED5rpausR+n+FJXmMwknlbcAw1Ie9j3ZTU+JrQvANMmaCJ41ay/2PjpMG4jk rxeN9ETwSWR3wtXUqJUHMmnr+o4DkJU0oktqPvyU= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH v3 1/5] dma: imx-sdma: add clock ratio 1:1 check Date: Wed, 23 Jan 2019 08:23:06 -0700 Message-Id: <20190123152310.11680-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123152310.11680-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190123152310.11680-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190123_072346_742388_3A040918 X-CRM114-Status: GOOD ( 11.05 ) 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: Daniel Baluta , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , angus.ainslie@puri.sm, linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 by Robin Gong Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0b3a67ff8e82..531a9d8b032a 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; } @@ -1840,6 +1848,11 @@ static int sdma_init(struct sdma_engine *sdma) if (ret) goto disable_clk_ipg; + if (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg)) + sdma->clk_ratio = 1; + else + sdma->clk_ratio = 0; + /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); @@ -1880,8 +1893,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); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel