From 6ac8c4c1a684ef7156d32786ccaf40d35d78f468 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 11 Nov 2010 12:15:06 +0100 Subject: [PATCH] --- yaml --- r: 228915 b: refs/heads/master c: 729b0c79c2c0f631bffe1be5abaf291febf7792f h: refs/heads/master i: 228913: cb20b1b5cffe23f8cde474eafffcd36bb9ef8f45 228911: 85cdaa6697ec3696b2e39c5caedc426fd9f4ad53 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/tmio_mmc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 280d597f2fe6..759f0b4e281a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a2727e98786136fb968b18d96f8ecdd9ba38aa8 +refs/heads/master: 729b0c79c2c0f631bffe1be5abaf291febf7792f diff --git a/trunk/drivers/mmc/host/tmio_mmc.c b/trunk/drivers/mmc/host/tmio_mmc.c index e7765a89593e..4e75799291ca 100644 --- a/trunk/drivers/mmc/host/tmio_mmc.c +++ b/trunk/drivers/mmc/host/tmio_mmc.c @@ -864,10 +864,15 @@ 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