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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED 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 7A1CFECDFB8 for ; Wed, 18 Jul 2018 18:22:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3859E2084E for ; Wed, 18 Jul 2018 18:22:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="unZUEuX5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3859E2084E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728304AbeGRTBE (ORCPT ); Wed, 18 Jul 2018 15:01:04 -0400 Received: from outils.crapouillou.net ([89.234.176.41]:41268 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729126AbeGRS77 (ORCPT ); Wed, 18 Jul 2018 14:59:59 -0400 From: Paul Cercueil To: Vinod Koul , Rob Herring , Mark Rutland , Ralf Baechle , Paul Burton , James Hogan , Zubair Lutfullah Kakakhel Cc: Mathieu Malaterre , Daniel Silsby , Paul Cercueil , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH v2 07/17] dmaengine: dma-jz4780: Add support for the JZ4740 SoC Date: Wed, 18 Jul 2018 20:20:13 +0200 Message-Id: <20180718182023.8182-8-paul@crapouillou.net> In-Reply-To: <20180718182023.8182-1-paul@crapouillou.net> References: <20180718182023.8182-1-paul@crapouillou.net> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1531938052; bh=Pk9d4Z9eTqw25tRfTraecrTMVkyuAGGWsU6B51VEQJM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=unZUEuX5pMUShTBk30Pfx1ZH7y5hfAov4NS99QJ3/7WcVQKAmpyMUeorlGV3cfWQQPyKpRsk2LGk6OoE5cXDrKTNMULZvNS5su5t4JNowVll9oi9JH5L2z/y2PwbuTostVrhkneqf3HEfD0g7OY1mzQsdRrmt9uPUmj6r+QDRB4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The JZ4740 SoC has a single DMA core starring six DMA channels. Signed-off-by: Paul Cercueil Tested-by: Mathieu Malaterre Reviewed-by: PrasannaKumar Muralidharan --- drivers/dma/Kconfig | 2 +- drivers/dma/dma-jz4780.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) v2: The documentation update is now in patch 01/17 diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 48d25dccedb7..a935d15ec581 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -143,7 +143,7 @@ config DMA_JZ4740 config DMA_JZ4780 tristate "JZ4780 DMA support" - depends on MACH_JZ4780 || MACH_JZ4770 || COMPILE_TEST + depends on MACH_INGENIC || COMPILE_TEST select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index a5f4a8d54516..084d4023637e 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -135,6 +135,7 @@ struct jz4780_dma_chan { }; enum jz_version { + ID_JZ4740, ID_JZ4770, ID_JZ4780, }; @@ -803,11 +804,13 @@ static struct dma_chan *jz4780_of_dma_xlate(struct of_phandle_args *dma_spec, } static const struct jz4780_dma_soc_data jz4780_dma_soc_data[] = { + [ID_JZ4740] = { .nb_channels = 6, .transfer_ord_max = 5, }, [ID_JZ4770] = { .nb_channels = 6, .transfer_ord_max = 6, }, [ID_JZ4780] = { .nb_channels = 32, .transfer_ord_max = 7, }, }; static const struct of_device_id jz4780_dma_dt_match[] = { + { .compatible = "ingenic,jz4740-dma", .data = (void *)ID_JZ4740 }, { .compatible = "ingenic,jz4770-dma", .data = (void *)ID_JZ4770 }, { .compatible = "ingenic,jz4780-dma", .data = (void *)ID_JZ4780 }, {}, -- 2.11.0