From patchwork Mon Jun 2 13:42:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 4282171 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4BE5EBEEAA for ; Mon, 2 Jun 2014 13:42:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C1B2203E1 for ; Mon, 2 Jun 2014 13:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CA6C203DC for ; Mon, 2 Jun 2014 13:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755206AbaFBNmY (ORCPT ); Mon, 2 Jun 2014 09:42:24 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:47133 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755208AbaFBNmW (ORCPT ); Mon, 2 Jun 2014 09:42:22 -0400 Received: from ayla.of.borg ([84.193.72.141]) by albert.telenet-ops.be with bizsmtp id 9RiM1o00232ts5g06RiMLT; Mon, 02 Jun 2014 15:42:21 +0200 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1WrSVI-0007lE-Sp; Mon, 02 Jun 2014 15:42:20 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: Ben Dooks , Laurent Pinchart , linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, dmaengine@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 1/7] DMA: shdma: Add r8a7791 support Date: Mon, 2 Jun 2014 15:42:05 +0200 Message-Id: <1401716531-29794-2-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1401716531-29794-1-git-send-email-geert+renesas@glider.be> References: <1401716531-29794-1-git-send-email-geert+renesas@glider.be> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Geert Uytterhoeven --- v2: - No changes Documentation/devicetree/bindings/dma/shdma.txt | 5 +++-- drivers/dma/sh/shdmac.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt index 86d5c509594b..d26b7065ae94 100644 --- a/Documentation/devicetree/bindings/dma/shdma.txt +++ b/Documentation/devicetree/bindings/dma/shdma.txt @@ -24,8 +24,9 @@ Optional properties (currently unused): Required properties: - compatible: should be of the form "renesas,shdma-", where should be replaced with the desired SoC model, e.g. - "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC - "renesas,shdma-r8a7790" for the DMAC on the R8A7790. + "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC, + "renesas,shdma-r8a7790" for the DMAC on the R8A7790, + "renesas,shdma-r8a7791" for the DMAC on the R8A7791. Example: dmac: dma-multiplexer@0 { diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 91b3f744d7b2..cdbc68e72ca1 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -691,6 +691,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { static const struct of_device_id sh_dmae_of_match[] = { { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid }, { .compatible = "renesas,shdma-r8a7790", .data = &shdma_arm_info }, + { .compatible = "renesas,shdma-r8a7791", .data = &shdma_arm_info }, {} }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match);