From patchwork Thu Jun 6 15:48:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2681711 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6C3DBDFF68 for ; Thu, 6 Jun 2013 15:48:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752834Ab3FFPs3 (ORCPT ); Thu, 6 Jun 2013 11:48:29 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:49543 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819Ab3FFPs0 (ORCPT ); Thu, 6 Jun 2013 11:48:26 -0400 Received: from axis700.grange (dslb-088-077-167-013.pools.arcor-ip.net [88.77.167.13]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MIAsE-1UoSAx0rgE-00446g; Thu, 06 Jun 2013 17:48:25 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id C359D40BB7; Thu, 6 Jun 2013 17:48:24 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UkcQK-0006BR-MP; Thu, 06 Jun 2013 17:48:24 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Guennadi Liakhovetski Subject: [PATCH v2 4/6] ARM: shmobile: r8a7740: add MMCIF DMA definitions Date: Thu, 6 Jun 2013 17:48:22 +0200 Message-Id: <1370533704-23734-5-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1370533704-23734-1-git-send-email-g.liakhovetski@gmx.de> References: <1370533704-23734-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:4ioWnOelxKH+lTsD8mS0KoQ+QyFTlOxx+6RwqjVNPtM RL5x8R6J4C9sB4Hkxjv1UYV9Ozqd0XAVyAYcfKpwTiCgQPDUke RGSUBdTyNOp6wAwkA6m9cf79dEaxicPWpeCU6sJz/dTUmQBpfq Gy0KHfMRjF6tIl9vQBKpspKS0q3KVFshIFv7Xv3f8Nk0BEfVkJ TAUGmYRWyaIGfNPMSVGz2kEihL/gaBajTnrLQN/r8A5nbHfw6J RxAuioqiGci9AFuKFeJFiOti5ZL5A0KQ4uCrvtjUdmybiTK4wq aoNL7VNMrH+mJl/KxqzYiP3v0dznug9hubvwClpgAJe2L5h4Tl TmjbS+9/rKYRVkoA1ISKelZIueDWC5jzKGOL7bKKxiebMU2Py+ BBrH89arvMaJQ== 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 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, }, };