From patchwork Fri May 27 10:44:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 823502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4RAiuYM022145 for ; Fri, 27 May 2011 10:45:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758841Ab1E0KpB (ORCPT ); Fri, 27 May 2011 06:45:01 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:64403 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758837Ab1E0KpA (ORCPT ); Fri, 27 May 2011 06:45:00 -0400 Received: from axis700.grange (dslb-094-221-103-246.pools.arcor-ip.net [94.221.103.246]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LbTPL-1PwObO3mzz-00lCRn; Fri, 27 May 2011 12:44:54 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 8D9B1189B6D; Fri, 27 May 2011 12:44:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 8A898189B6B; Fri, 27 May 2011 12:44:53 +0200 (CEST) Date: Fri, 27 May 2011 12:44:53 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: linux-mmc@vger.kernel.org, Ian Molton , Magnus Damm , Simon Horman Subject: [PATCH 2/3] sh: add coherent DMA mask for SDHI devices In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:utSSjuXy0QOzed0xdlHIA8hvJBTT89315PAOFnhXRtG miv40gA5LDFyFT1dAkPgN9tbIEJ+w7XHaxzPV/MOBCW7lbVbg2 XXndCh6Vhpn5hMNEa6v/LLuf0KQN1vR8KfBBaaXEsVA439dyzN tvtIO8c74P5z4P2XjPhIAATfpE6wPYpHY0/3gnsHs4XhPkt1xy olucIppeHTE5UPS7Q2ABgefEEq4a/PCye1xWqSW5LQ= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 27 May 2011 10:45:08 +0000 (UTC) It is now required, because the SDHI / TMIO driver is using dma_alloc_coherent() to allocate the DMA bounce buffer. Signed-off-by: Guennadi Liakhovetski --- arch/sh/boards/board-sh7757lcr.c | 3 ++- arch/sh/boards/mach-ap325rxa/setup.c | 6 ++++-- arch/sh/boards/mach-ecovec24/setup.c | 6 ++++-- arch/sh/boards/mach-kfr2r09/setup.c | 3 ++- arch/sh/boards/mach-migor/setup.c | 3 ++- arch/sh/boards/mach-se/7724/setup.c | 6 ++++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index fa2a208..e40f82c 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c @@ -256,7 +256,8 @@ static struct platform_device sdhi_device = { .resource = sdhi_resources, .id = 0, .dev = { - .platform_data = &sdhi_info, + .platform_data = &sdhi_info, + .coherent_dma_mask = 0xffffffff, }, }; diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 618bd56..c3e80cf 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c @@ -458,7 +458,8 @@ static struct platform_device sdhi0_cn3_device = { .num_resources = ARRAY_SIZE(sdhi0_cn3_resources), .resource = sdhi0_cn3_resources, .dev = { - .platform_data = &sdhi0_cn3_data, + .platform_data = &sdhi0_cn3_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI0, @@ -488,7 +489,8 @@ static struct platform_device sdhi1_cn7_device = { .num_resources = ARRAY_SIZE(sdhi1_cn7_resources), .resource = sdhi1_cn7_resources, .dev = { - .platform_data = &sdhi1_cn7_data, + .platform_data = &sdhi1_cn7_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI1, diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index bb13d0e..5b4e3c9 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -515,7 +515,8 @@ static struct platform_device sdhi0_device = { .resource = sdhi0_resources, .id = 0, .dev = { - .platform_data = &sdhi0_info, + .platform_data = &sdhi0_info, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI0, @@ -555,7 +556,8 @@ static struct platform_device sdhi1_device = { .resource = sdhi1_resources, .id = 1, .dev = { - .platform_data = &sdhi1_info, + .platform_data = &sdhi1_info, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI1, diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 8b4abbb..76d9d08 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -375,7 +375,8 @@ static struct platform_device kfr2r09_sh_sdhi0_device = { .num_resources = ARRAY_SIZE(kfr2r09_sh_sdhi0_resources), .resource = kfr2r09_sh_sdhi0_resources, .dev = { - .platform_data = &sh7724_sdhi0_data, + .platform_data = &sh7724_sdhi0_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI0, diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 184fde1..e89a599 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -419,7 +419,8 @@ static struct platform_device sdhi_cn9_device = { .num_resources = ARRAY_SIZE(sdhi_cn9_resources), .resource = sdhi_cn9_resources, .dev = { - .platform_data = &sh7724_sdhi_data, + .platform_data = &sh7724_sdhi_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI, diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 1235767..4caa846 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -477,7 +477,8 @@ static struct platform_device sdhi0_cn7_device = { .num_resources = ARRAY_SIZE(sdhi0_cn7_resources), .resource = sdhi0_cn7_resources, .dev = { - .platform_data = &sh7724_sdhi0_data, + .platform_data = &sh7724_sdhi0_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI0, @@ -509,7 +510,8 @@ static struct platform_device sdhi1_cn8_device = { .num_resources = ARRAY_SIZE(sdhi1_cn8_resources), .resource = sdhi1_cn8_resources, .dev = { - .platform_data = &sh7724_sdhi1_data, + .platform_data = &sh7724_sdhi1_data, + .coherent_dma_mask = 0xffffffff, }, .archdata = { .hwblk_id = HWBLK_SDHI1,