From patchwork Fri Mar 11 17:18:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 628571 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 p2BHGQIj029699 for ; Fri, 11 Mar 2011 17:18:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827Ab1CKRSQ (ORCPT ); Fri, 11 Mar 2011 12:18:16 -0500 Received: from service87.mimecast.com ([94.185.240.25]:38494 "HELO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750981Ab1CKRSQ (ORCPT ); Fri, 11 Mar 2011 12:18:16 -0500 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 11 Mar 2011 17:18:13 +0000 Received: from localhost.localdomain ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 11 Mar 2011 17:18:10 +0000 From: Pawel Moll To: linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Subject: [PATCH] arm: mmci: Add ARM variant with extended FIFO Date: Fri, 11 Mar 2011 17:18:07 +0000 Message-Id: <1299863887-15490-1-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.6.3.3 X-OriginalArrivalTime: 11 Mar 2011 17:18:10.0690 (UTC) FILETIME=[4BDA7E20:01CBE010] X-MC-Unique: 111031117181307301 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, 11 Mar 2011 17:18:17 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter1.kernel.org id p2BHGQIj029699 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2d6de3e..e7197b0 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -66,6 +66,12 @@ static struct variant_data variant_arm = { .datalength_bits = 16, }; +static struct variant_data variant_arm_extended_fifo = { + .fifosize = 128 * 4, + .fifohalfsize = 64 * 4, + .datalength_bits = 16, +}; + static struct variant_data variant_u300 = { .fifosize = 16 * 4, .fifohalfsize = 8 * 4, @@ -1019,10 +1025,15 @@ static int mmci_resume(struct amba_device *dev) static struct amba_id mmci_ids[] = { { .id = 0x00041180, - .mask = 0x000fffff, + .mask = 0xff0fffff, .data = &variant_arm, }, { + .id = 0x01041180, + .mask = 0xff0fffff, + .data = &variant_arm_extended_fifo, + }, + { .id = 0x00041181, .mask = 0x000fffff, .data = &variant_arm,