From patchwork Fri Apr 26 16:27:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2494281 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 974F23FC64 for ; Fri, 26 Apr 2013 16:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756293Ab3DZQ1z (ORCPT ); Fri, 26 Apr 2013 12:27:55 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:53039 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754067Ab3DZQ1y (ORCPT ); Fri, 26 Apr 2013 12:27:54 -0400 Received: from axis700.grange (dslb-088-076-028-093.pools.arcor-ip.net [88.76.28.93]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1UVlUy1OZk-000dUY; Fri, 26 Apr 2013 18:27:48 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id DCEE340BB7; Fri, 26 Apr 2013 18:27:47 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UVlUx-00064T-Jc; Fri, 26 Apr 2013 18:27:47 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , linux-arm-kernel@lists.infradead.org, Guennadi Liakhovetski Subject: [PATCH 4/6] ARM: shmobile: r8a7740: add MMCIF DMA definitions Date: Fri, 26 Apr 2013 18:27:45 +0200 Message-Id: <1366993667-23294-5-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1366993667-23294-1-git-send-email-g.liakhovetski@gmx.de> References: <1366993667-23294-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:5BTe7wKA/WOo7KpvGHUsNLwlW5bdIl0sTOdE4LfzkFj AKstCC/KMwDRd4dGNpcBxWY3vgk6F+P08ZB5yEwKQHNK8Wwxaz ud99BO/JDc5Q8g9+qjB7CVVqhWemz0cJHacpxCYC5GHtX5UXVH zbX0QDqe2YmMVIAw306WCR5gqWwKU5HUvixvIF4m+NAn87lzLT ESBg0w5o2jW+dvs/4yikZbfKZkXLUQziJzOm9FDRt+G9+j7nqp T9V10PQmNGumrScEA7LRXI/IGQuW6GDLn4ae4EdRYNIc9IosYl z3g0ubVIioAPc5iyE2STNdAWPQFljoiOhUnRkJu31AWUfuzYrv 0s5x0AhpG+VmMKKlRNr5erPI3/8YKJqcbvCQhHczKHDkZdGiGg gwV7a2RrjsLlg== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Add DMA channel slave IDs and configuration entries for the r8a7740 MMCIF controller. Signed-off-by: Guennadi Liakhovetski --- arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 ++ arch/arm/mach-shmobile/setup-r8a7740.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h index 7b1138f..536c021 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7740.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7740.h @@ -42,6 +42,8 @@ enum { SHDMA_SLAVE_FSIB_TX, SHDMA_SLAVE_USBHS_TX, SHDMA_SLAVE_USBHS_RX, + SHDMA_SLAVE_MMCIF_TX, + SHDMA_SLAVE_MMCIF_RX, }; extern void r8a7740_meram_workaround(void); diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 00c5a70..6b3ed42 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -588,6 +588,16 @@ static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = { .addr = 0xfe1f0064, .chcr = CHCR_TX(XMIT_SZ_32BIT), .mid_rid = 0xb5, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_TX, + .addr = 0xe6bd0034, + .chcr = CHCR_TX(XMIT_SZ_32BIT), + .mid_rid = 0xd1, + }, { + .slave_id = SHDMA_SLAVE_MMCIF_RX, + .addr = 0xe6bd0034, + .chcr = CHCR_RX(XMIT_SZ_32BIT), + .mid_rid = 0xd2, }, };