From patchwork Wed Jun 18 09:11:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4374591 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0C5559F314 for ; Wed, 18 Jun 2014 09:11:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 328C5202FE for ; Wed, 18 Jun 2014 09:11:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37BC8202F2 for ; Wed, 18 Jun 2014 09:11:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964920AbaFRJLb (ORCPT ); Wed, 18 Jun 2014 05:11:31 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:54114 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964819AbaFRJL1 (ORCPT ); Wed, 18 Jun 2014 05:11:27 -0400 Received: by mail-pb0-f44.google.com with SMTP id md12so542180pbc.17 for ; Wed, 18 Jun 2014 02:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:from:subject:user-agent:to:cc:in-reply-to :references:mime-version:content-type; bh=z2KMHqPaSVg8f3k/Q8WeFJFp/hKYvz9FbTP0fIYkk9Y=; b=Ml74EB0vjf1FIuV5kQrtwCuYYAxfdYjRfRdV0xPkW41rwxDwCnhBBjqjaRu+Xo5xIa vUF8p4KCW8PTi9kxFXsxaOU8QGz3wPyTJjKI+VB+DvkXwp7bY4OVTcI9mSbGM94pXM6c 9mKUIvV1btjnbt2jB8LP8bb6Z6Es9UutcKy2u988hSEEyttxwr7u6QwP4xhwCJzLqneq IzEQTISS/cNQQKURGmuVnPptGK4Dtx2HOp1Qx1WBt1IXGaK/1yLjqMOTLPKSdUzXieXw 67jMxjnJokrekLmKU2eAdDDshtM7gfXDCiW1qZOKL6duDrVKH5+Xkmwevbqj7CDyh8r4 1dRA== X-Received: by 10.66.242.171 with SMTP id wr11mr783111pac.111.1403082687088; Wed, 18 Jun 2014 02:11:27 -0700 (PDT) Received: from remon.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id fb4sm7402617pac.30.2014.06.18.02.11.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 18 Jun 2014 02:11:26 -0700 (PDT) Date: Wed, 18 Jun 2014 02:11:26 -0700 (PDT) Message-ID: <87bntqy43k.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PROTOTYPE 8/8] shdmac-of: fixup for test User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Simon Cc: Kuninori Morimoto , Magnus , linux-sh@vger.kernel.org In-Reply-To: <87mwday4gg.wl%kuninori.morimoto.gx@renesas.com> References: <87oaxqy4i1.wl%kuninori.morimoto.gx@gmail.com> <87mwday4gg.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 From: Ben Dooks Signed-off-by: Kuninori Morimoto --- drivers/dma/sh/shdma-of.c | 9 +++++---- drivers/dma/sh/shdmac.c | 2 +- include/dt-bindings/dma/r8a7790-dma.h | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c index 696716b..6296f19 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -43,11 +43,11 @@ static struct sh_dmae_pdata arm_dmae_info = { struct sh_dmae_of_info shdma_arm_info = { .pdata_template = &arm_dmae_info, - .channel_offset = 0x8000-0x20, + .channel_offset = 0x8000, .channel_stride = 0x80, - .offset = 0x0, - .dmars = 0x40, - .chclr_offset = 0x80, + .offset = 0x00 - 0x20, + .dmars = 0x40 - 0x20, + .chclr_offset = 0x80 - 0x20, }; /* Need global index due to shdma_slave_used being global */ @@ -123,6 +123,7 @@ static struct dma_chan *shdma_of_xlate(struct of_phandle_args *dma_spec, client->cfg.slave_id = id; client->cfg.mid_rid = id; client->cfg.chcr = dma_spec->args[1]; + INIT_LIST_HEAD(&client->node); dev_dbg(&pdev->dev, "new client %d, %02x\n", client->index, id); diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index f2ecec8..7d2d086 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -691,7 +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,dma-r8a7790", .data = &shdma_arm_info }, + { .compatible = "renesas,shdma-r8a7790", .data = &shdma_arm_info }, {} }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match); diff --git a/include/dt-bindings/dma/r8a7790-dma.h b/include/dt-bindings/dma/r8a7790-dma.h index 732422a..6b90206 100644 --- a/include/dt-bindings/dma/r8a7790-dma.h +++ b/include/dt-bindings/dma/r8a7790-dma.h @@ -222,6 +222,8 @@ #define R8A7790_DMA_SSIND9_TX (0x13) #define R8A7790_DMA_SSIND9_RX (0x14) +#define CHCR_RX_16BIT SHDMA_ARM_CHCR_RX(SHDMA_ARM_SZ_16BIT) +#define CHCR_TX_16BIT SHDMA_ARM_CHCR_TX(SHDMA_ARM_SZ_16BIT) #define CHCR_RX_32BIT SHDMA_ARM_CHCR_RX(SHDMA_ARM_SZ_32BIT) #define CHCR_TX_32BIT SHDMA_ARM_CHCR_TX(SHDMA_ARM_SZ_32BIT) #define CHCR_RX_256BIT SHDMA_ARM_CHCR_RX(SHDMA_ARM_SZ_256BIT)