From patchwork Wed Jun 26 14:40:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2785591 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 DC8B29F968 for ; Wed, 26 Jun 2013 14:41:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C32182055B for ; Wed, 26 Jun 2013 14:41:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 972DE20555 for ; Wed, 26 Jun 2013 14:41:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611Ab3FZOlQ (ORCPT ); Wed, 26 Jun 2013 10:41:16 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:54866 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752648Ab3FZOlL (ORCPT ); Wed, 26 Jun 2013 10:41:11 -0400 Received: from axis700.grange (dslb-178-001-151-028.pools.arcor-ip.net [178.1.151.28]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LnX10-1ULEu40Lss-00hXY6; Wed, 26 Jun 2013 16:40:58 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 4332C40BB6; Wed, 26 Jun 2013 16:40:57 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Urqu0-0002b2-Tq; Wed, 26 Jun 2013 16:40:56 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, Magnus Damm , Simon Horman , Guennadi Liakhovetski Subject: [PATCH v3 4/7] ARM: shmobile: r8a7740: add MMCIF DMA definitions Date: Wed, 26 Jun 2013 16:40:53 +0200 Message-Id: <1372257656-9944-5-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1372257656-9944-1-git-send-email-g.liakhovetski@gmx.de> References: <1372257656-9944-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:stfRodavn9ITISTkQLk/DkwRCLTp5UobV5gNqIyV2KX PsHQgFS0kmyN8342dOMRA/UkDaRr95XtHv44oNMCyk5HBfP3Xr FZOXrTSpjsnc/uHCh9hKsMAHeMASbqeBsY7BZdsB7wR7rpWFaL xm5KXTUZUiyPfZSWTtpM3Qywt+Iboz6Fs1HRamy7bDGgZDuBnk EBpYd/rHxHaSbu7DNKszgl5FvBuOihNiaRleVodCoQxvbTxbjD 7yWyuFG4ct+08WfvtAGIcHablBtgrHLsCAjC5v/Kx+WZH16dq9 d1pcCTogzGQmPkd9pzOnuf0xwkYYHJpgItWHYCESmA9bPHqYp7 x9NLTNvhaK6V/R04FGUzEUTiBKekahTMM8gdY42mxQQUXgx+M3 I2NM7eakdbr4w== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 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 b34d19b..56f3750 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, }, };