From patchwork Fri May 27 10:44:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 823522 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 p4RAiuYO022145 for ; Fri, 27 May 2011 10:45:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758843Ab1E0KpG (ORCPT ); Fri, 27 May 2011 06:45:06 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:56325 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758837Ab1E0KpF (ORCPT ); Fri, 27 May 2011 06:45:05 -0400 Received: from axis700.grange (dslb-094-221-103-246.pools.arcor-ip.net [94.221.103.246]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0LZf8m-1Pw7cM27Aq-00lYZ6; Fri, 27 May 2011 12:44:58 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 2EEBD189B6D; Fri, 27 May 2011 12:44:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 2C03E189B6B; Fri, 27 May 2011 12:44:58 +0200 (CEST) Date: Fri, 27 May 2011 12:44:58 +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 3/3] ARM: mach-shmobile: add coherent DMA mask for SDHI devices In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:hL6p0NUnjEyhAnNp35uZmpoaWSIcigBYaiD5NzRAHZs PH2PEFVCJjYY+kwOkJVW+JiG88he9vZ+3fTMNXLc36VuMIaYAf 6g+YGSZZJloF5ke3gcou+FbbtHPAxJiRQh4d6ZEDWqG2qlKrsx XS6jTXFj9VLS5I8hswQ11MWj91ccCvyNa6KHyvgK8VJoENe6eU J2f6xZv4OYdFuLnxglR6ITIgFW5tuQ9IPyppkGyC5M= 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:09 +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/arm/mach-shmobile/board-ag5evm.c | 6 ++++-- arch/arm/mach-shmobile/board-ap4evb.c | 6 ++++-- arch/arm/mach-shmobile/board-mackerel.c | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index c95258c..a5a737c 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -372,7 +372,8 @@ static struct platform_device sdhi0_device = { .num_resources = ARRAY_SIZE(sdhi0_resources), .resource = sdhi0_resources, .dev = { - .platform_data = &sdhi0_info, + .platform_data = &sdhi0_info, + .coherent_dma_mask = 0xffffffff, }, }; @@ -415,7 +416,8 @@ static struct platform_device sdhi1_device = { .name = "sh_mobile_sdhi", .id = 1, .dev = { - .platform_data = &sh_sdhi1_platdata, + .platform_data = &sh_sdhi1_platdata, + .coherent_dma_mask = 0xffffffff, }, .num_resources = ARRAY_SIZE(sdhi1_resources), .resource = sdhi1_resources, diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 08acb6e..2b139bd 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -335,7 +335,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, }, }; @@ -376,7 +377,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, }, }; diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 888fd30..9ee66d1 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -901,7 +901,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, }, }; @@ -944,7 +945,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, }, }; #endif @@ -995,7 +997,8 @@ static struct platform_device sdhi2_device = { .resource = sdhi2_resources, .id = 2, .dev = { - .platform_data = &sdhi2_info, + .platform_data = &sdhi2_info, + .coherent_dma_mask = 0xffffffff, }, };