From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + sh-add-dma-slaves-for-two-sdhi-controllers-to-sh7722.patch added to -mm tree Date: Wed, 12 May 2010 15:55:40 -0700 Message-ID: <201005122255.o4CMte6b025643@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:42449 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757192Ab0ELW4v (ORCPT ); Wed, 12 May 2010 18:56:51 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: g.liakhovetski@gmx.de, dan.j.williams@intel.com, ian@mnementh.co.uk, lethal@linux-sh.org, magnus.damm@gmail.com, rmk@arm.linux.org.uk, sameo@linux.intel.com The patch titled sh: add DMA slaves for two SDHI controllers to sh7722 has been added to the -mm tree. Its filename is sh-add-dma-slaves-for-two-sdhi-controllers-to-sh7722.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sh: add DMA slaves for two SDHI controllers to sh7722 From: Guennadi Liakhovetski SuperH SDHI controllers can use DMA, add slave definitions to sh7722. Signed-off-by: Guennadi Liakhovetski Cc: Dan Williams Cc: Ian Molton Cc: Magnus Damm Cc: Samuel Ortiz Cc: Russell King Cc: Paul Mundt Signed-off-by: Andrew Morton --- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN arch/sh/kernel/cpu/sh4a/setup-sh7722.c~sh-add-dma-slaves-for-two-sdhi-controllers-to-sh7722 arch/sh/kernel/cpu/sh4a/setup-sh7722.c --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c~sh-add-dma-slaves-for-two-sdhi-controllers-to-sh7722 +++ a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c @@ -74,6 +74,16 @@ static const struct sh_dmae_slave_config .addr = 0xa454c094, .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT), .mid_rid = 0xb6, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_TX, + .addr = 0x04ce0030, + .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT), + .mid_rid = 0xc1, + }, { + .slave_id = SHDMA_SLAVE_SDHI0_RX, + .addr = 0x04ce0030, + .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT), + .mid_rid = 0xc2, }, }; _ Patches currently in -mm which might be from g.liakhovetski@gmx.de are linux-next.patch sh-define-dma-slaves-per-cpu-type-remove-now-redundant-header.patch sh-add-dma-slaves-for-two-sdhi-controllers-to-sh7722.patch sh-add-dma-slave-definitions-to-sh7724.patch sh-prepare-the-sdhi-mfd-driver-to-pass-dma-configuration-to-tmio_mmcc.patch mmc-add-dma-support-to-tmio_mmc-driver-when-used-on-superh.patch sh-add-sdhi-dma-support-to-ecovec.patch sh-add-sdhi-dma-support-to-ms7724se.patch sh-add-sdhi-dma-support-to-kfr2r09.patch sh-add-sdhi-dma-support-to-migor.patch arm-add-dma-support-to-sh7372-enable-dma-for-sdhi.patch