From patchwork Wed Oct 23 03:05:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11205623 X-Patchwork-Delegate: paulburton@kernel.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10AAE913 for ; Wed, 23 Oct 2019 03:05:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2458214B2 for ; Wed, 23 Oct 2019 03:05:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="WimihvXB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389558AbfJWDFy (ORCPT ); Tue, 22 Oct 2019 23:05:54 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25421 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389529AbfJWDFy (ORCPT ); Tue, 22 Oct 2019 23:05:54 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1571799938; cv=none; d=zohomail.com; s=zohoarc; b=alDZSa/zwVG35lZ9NVMD8gMTfszk2u2d7oJPcmh1zY3+CF65WHrDxjPseiXXSugUtM5tSyM1QbBmV3UzOfiUGdIR+5eEYJjFcAittPFz3UPCpMW/0CvAVZbLs1jSUPPc0avUXhdwAwIm/LjRXdP0ZhtumDgrQdUEYQRZ6ZPWLuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1571799938; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=+ZC+Ztn4Z88CANaZD4GP5wciSkS3J6M/3/Mvs4l0lQU=; b=c5BKo9mAqAHVqLt2QsGeEXrcZh2gUHRpW3yQAUSUlujOFielwA/n5Y8avbhG7S4t+qHQP0dlfTUcEl/MVwR5x6wjmemXnKpGJcfDmwcUh16OMQ510T21Pzrfk+qO5K2GusGniNoSD18RPyP979DD6K4cH3/pdFuRqvDUNpQvWHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=hyNBCoiEGawmaV2oRxT66jQbV6DsG7UCLnSv2Na85CdDtvCtY+RaT3uN4Wf6zQuIAi2NywGr0mxb nr8pD5VMGe4pFc3Mo/FTlDD6MgdVX87+06ls+QsiKeDcmWLfptlZ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1571799938; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=2663; bh=+ZC+Ztn4Z88CANaZD4GP5wciSkS3J6M/3/Mvs4l0lQU=; b=WimihvXB59/+jlhasElTxyEYdebY4G4f6YEba+mf4x25aHEEV80QqvfIad/KAZK+ TkxD+bu8rR8fB1UuM3t9aG9Uhcwc6l9plUqO4QAOnbBTnzjwn5ZyrZm1s/oJD3zYUOl Nhn0xZBryou9SLg56HuW0dokFl1lft870LM/2el8= Received: from zhouyanjie-virtual-machine.lan (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1571799937274540.3617094666886; Tue, 22 Oct 2019 20:05:37 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, paul.burton@mips.com, vkoul@kernel.org, paul@crapouillou.net, mark.rutland@arm.com, Zubair.Kakakhel@imgtec.com, dan.j.williams@intel.com Subject: [PATCH 1/2] dt-bindings: DMA: Add X1000 bindings. Date: Wed, 23 Oct 2019 11:05:02 +0800 Message-Id: <1571799903-44561-2-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571799903-44561-1-git-send-email-zhouyanjie@zoho.com> References: <1571799903-44561-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add the DMA bindings for the X1000 Soc from Ingenic. Signed-off-by: Zhou Yanjie --- .../devicetree/bindings/dma/jz4780-dma.txt | 3 +- include/dt-bindings/dma/x1000-dma.h | 40 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 include/dt-bindings/dma/x1000-dma.h diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt index 636fcb2..ec89782 100644 --- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt +++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt @@ -7,10 +7,11 @@ Required properties: * ingenic,jz4725b-dma * ingenic,jz4770-dma * ingenic,jz4780-dma + * ingenic,x1000-dma - reg: Should contain the DMA channel registers location and length, followed by the DMA controller registers location and length. - interrupts: Should contain the interrupt specifier of the DMA controller. -- clocks: Should contain a clock specifier for the JZ4780 PDMA clock. +- clocks: Should contain a clock specifier for the JZ4780/X1000 PDMA clock. - #dma-cells: Must be <2>. Number of integer cells in the dmas property of DMA clients (see below). diff --git a/include/dt-bindings/dma/x1000-dma.h b/include/dt-bindings/dma/x1000-dma.h new file mode 100644 index 00000000..401e165 --- /dev/null +++ b/include/dt-bindings/dma/x1000-dma.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * This header provides macros for X1000 DMA bindings. + * + * Copyright (c) 2019 Zhou Yanjie + */ + +#ifndef __DT_BINDINGS_DMA_X1000_DMA_H__ +#define __DT_BINDINGS_DMA_X1000_DMA_H__ + +/* + * Request type numbers for the X1000 DMA controller (written to the DRTn + * register for the channel). + */ +#define X1000_DMA_DMIC_RX 0x5 +#define X1000_DMA_I2S0_TX 0x6 +#define X1000_DMA_I2S0_RX 0x7 +#define X1000_DMA_AUTO 0x8 +#define X1000_DMA_UART2_TX 0x10 +#define X1000_DMA_UART2_RX 0x11 +#define X1000_DMA_UART1_TX 0x12 +#define X1000_DMA_UART1_RX 0x13 +#define X1000_DMA_UART0_TX 0x14 +#define X1000_DMA_UART0_RX 0x15 +#define X1000_DMA_SSI0_TX 0x16 +#define X1000_DMA_SSI0_RX 0x17 +#define X1000_DMA_MSC0_TX 0x1a +#define X1000_DMA_MSC0_RX 0x1b +#define X1000_DMA_MSC1_TX 0x1c +#define X1000_DMA_MSC1_RX 0x1d +#define X1000_DMA_PCM0_TX 0x20 +#define X1000_DMA_PCM0_RX 0x21 +#define X1000_DMA_SMB0_TX 0x24 +#define X1000_DMA_SMB0_RX 0x25 +#define X1000_DMA_SMB1_TX 0x26 +#define X1000_DMA_SMB1_RX 0x27 +#define X1000_DMA_SMB2_TX 0x28 +#define X1000_DMA_SMB2_RX 0x29 + +#endif /* __DT_BINDINGS_DMA_X1000_DMA_H__ */ From patchwork Wed Oct 23 03:05:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11205625 X-Patchwork-Delegate: paulburton@kernel.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5104313B1 for ; Wed, 23 Oct 2019 03:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FD44214B2 for ; Wed, 23 Oct 2019 03:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="CR8UgsX/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389611AbfJWDGE (ORCPT ); Tue, 22 Oct 2019 23:06:04 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25429 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732703AbfJWDGE (ORCPT ); Tue, 22 Oct 2019 23:06:04 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1571799948; cv=none; d=zohomail.com; s=zohoarc; b=CwQbYnVGK6JbEVTd9NtY96mgOIX0S+1ATTxhKH6VxhNzWUnsqqcDB0OZHWcZwcp3mbH9V5BqvHHf0MOPiX91Tw3Z5aRCxyKnKL4LSv6SsDlJ4siMmQpq6dTwQb4kZUwhMhtFFuN5B3Q3M/w3Nn73za1nSi1KZo5SvB0srFM/pBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1571799948; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=A/dWkEZHy42hUUFI5RXmIqSsQ6EBJgvvYOFnxw/N3t4=; b=Eh2bimbhGUK1gwV1cbkQMGalwW3rTZnKoiiVQl1SLWmVy1+Ko/cp3gTza0I7Dn12y2TweUbxWA17sQPxhy50BhjUnWhqHFryX2avFmQo5u5dfZl91Lb6K69y+1Jw5AYMx/7SQNn1eHaTi+2FqFQDz/oOArXo84R5twIB7KLbGwY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=neLtYkaMBFP1gAOPQuIsPSE3OhcyzIhcENIuUYhFXPQCKAc5an/KZWbTWD7y4qzj9MW6tOKT0n3m h+GTfZXTDBIevAFmBsGiMiaeJjuzUMAhJGsuzxyTJnQyWmxuylGr DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1571799948; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1209; bh=A/dWkEZHy42hUUFI5RXmIqSsQ6EBJgvvYOFnxw/N3t4=; b=CR8UgsX/Hty7kc2s+vlfAcUNwUQF8BDLekPCoqA61JtdnZhoKJIgSUME1WANanqK 0jqrq0af12Fp1zDvF7Tthk+oZF92VnOl0iuYFTIvxdgp81Q9QSQKNoUU8matWmIhV7C vW7u2Babilr8yvR7QWQdVWmrTrHhHv5VfWotQbi0= Received: from zhouyanjie-virtual-machine.lan (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1571799946481488.59997078669005; Tue, 22 Oct 2019 20:05:46 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, paul.burton@mips.com, vkoul@kernel.org, paul@crapouillou.net, mark.rutland@arm.com, Zubair.Kakakhel@imgtec.com, dan.j.williams@intel.com Subject: [PATCH 2/2] DMA: JZ4780: Add support for the X1000. Date: Wed, 23 Oct 2019 11:05:03 +0800 Message-Id: <1571799903-44561-3-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571799903-44561-1-git-send-email-zhouyanjie@zoho.com> References: <1571799903-44561-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add support for probing the dma-jz4780 driver on the X1000 Soc. Signed-off-by: Zhou Yanjie --- drivers/dma/dma-jz4780.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index 7fe9309..c7f1199 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -1012,11 +1012,18 @@ static const struct jz4780_dma_soc_data jz4780_dma_soc_data = { .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA, }; +static const struct jz4780_dma_soc_data x1000_dma_soc_data = { + .nb_channels = 8, + .transfer_ord_max = 7, + .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA, +}; + static const struct of_device_id jz4780_dma_dt_match[] = { { .compatible = "ingenic,jz4740-dma", .data = &jz4740_dma_soc_data }, { .compatible = "ingenic,jz4725b-dma", .data = &jz4725b_dma_soc_data }, { .compatible = "ingenic,jz4770-dma", .data = &jz4770_dma_soc_data }, { .compatible = "ingenic,jz4780-dma", .data = &jz4780_dma_soc_data }, + { .compatible = "ingenic,x1000-dma", .data = &x1000_dma_soc_data }, {}, }; MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);