From patchwork Mon Aug 23 20:09:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 177292 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Mon, 23 Aug 2010 21:09:57 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OndLA-00008R-M1 for chris@printf.net; Mon, 23 Aug 2010 21:09:56 +0100 Received: by mail.laptop.org (Postfix) id DB910242C0; Mon, 23 Aug 2010 16:09:35 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 0EF4D242BD for ; Mon, 23 Aug 2010 16:09:34 -0400 (EDT) X-ASG-Debug-ID: 1282594187-0b7418b80004-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id HJUh4XPrGHCVALDx for ; Mon, 23 Aug 2010 16:09:49 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754384Ab0HWUJ3 (ORCPT ); Mon, 23 Aug 2010 16:09:29 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:38942 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753630Ab0HWUJ0 (ORCPT ); Mon, 23 Aug 2010 16:09:26 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o7NK9LPU012998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 23 Aug 2010 13:09:21 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o7NK9LIf012151; Mon, 23 Aug 2010 13:09:21 -0700 Message-Id: <201008232009.o7NK9LIf012151@imap1.linux-foundation.org> X-ASG-Orig-Subj: + sdhci-support-mmc_cap_mmc_highspeed.patch added to -mm tree Subject: + sdhci-support-mmc_cap_mmc_highspeed.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: zhangfei.gao@gmail.com, linux-mmc@vger.kernel.org, matt@console-pimps.org, zgao6@marvell.com From: akpm@linux-foundation.org Date: Mon, 23 Aug 2010 13:09:21 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1282594189 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.38828 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/host/sdhci.c~sdhci-support-mmc_cap_mmc_highspeed drivers/mmc/host/sdhci.c --- a/drivers/mmc/host/sdhci.c~sdhci-support-mmc_cap_mmc_highspeed +++ a/drivers/mmc/host/sdhci.c @@ -1824,7 +1824,7 @@ int sdhci_add_host(struct sdhci_host *ho mmc->caps |= MMC_CAP_4_BIT_DATA; if (caps & SDHCI_CAN_DO_HISPD) - mmc->caps |= MMC_CAP_SD_HIGHSPEED; + mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) mmc->caps |= MMC_CAP_NEEDS_POLL;