From patchwork Thu Nov 11 11:15:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 317152 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 oABBF38n021553 for ; Thu, 11 Nov 2010 11:15:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755372Ab0KKLPC (ORCPT ); Thu, 11 Nov 2010 06:15:02 -0500 Received: from mailout-de.gmx.net ([213.165.64.22]:60814 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1754690Ab0KKLPB (ORCPT ); Thu, 11 Nov 2010 06:15:01 -0500 Received: (qmail invoked by alias); 11 Nov 2010 11:14:59 -0000 Received: from p50898DEB.dip0.t-ipconnect.de (EHLO axis700.grange) [80.137.141.235] by mail.gmx.net (mp016) with SMTP; 11 Nov 2010 12:14:59 +0100 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX186JJ5X7s86lI/mq03Q4NttVgxmxAp1a4NS1rAdHc HMWDE0epzBa+4Z Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1PGV7S-0000hR-3T; Thu, 11 Nov 2010 12:15:06 +0100 Date: Thu, 11 Nov 2010 12:15:06 +0100 (CET) From: Guennadi Liakhovetski To: linux-mmc@vger.kernel.org cc: linux-sh@vger.kernel.org, Ian Molton Subject: [PATCH/RESEND] mmc: tmio_mmc: allow multi-element scatter-gather lists (fwd) Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Nov 2010 11:15:04 +0000 (UTC) diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index e7765a8..9034414 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -864,10 +864,14 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) goto host_free; mmc->ops = &tmio_mmc_ops; - mmc->caps = MMC_CAP_4_BIT_DATA; - mmc->caps |= pdata->capabilities; + mmc->caps = MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->f_max = pdata->hclk; mmc->f_min = mmc->f_max / 512; + mmc->max_segs = 32; + mmc->max_blk_size = 512; + mmc->max_blk_count = PAGE_CACHE_SIZE / mmc->max_blk_size * mmc->max_segs; + mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; + mmc->max_seg_size = mmc->max_req_size; if (pdata->ocr_mask) mmc->ocr_avail = pdata->ocr_mask; else