From patchwork Wed Oct 6 18:57:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 236711 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 o96Ix43b009528 for ; Wed, 6 Oct 2010 18:59:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933028Ab0JFS64 (ORCPT ); Wed, 6 Oct 2010 14:58:56 -0400 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]:50563 "HELO na3sys009aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933029Ab0JFS64 convert rfc822-to-8bit (ORCPT ); Wed, 6 Oct 2010 14:58:56 -0400 Received: from source ([65.219.4.130]) (using TLSv1) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKTKzG72ZA2qs0dkhSfWUAL/jzfvv0O0na@postini.com; Wed, 06 Oct 2010 11:58:56 PDT Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by sc-owa02.marvell.com ([10.93.76.22]) with mapi; Wed, 6 Oct 2010 11:57:24 -0700 From: Philip Rakity To: "linux-mmc@vger.kernel.org" Date: Wed, 6 Oct 2010 11:57:23 -0700 Subject: [PATCH] sdhci: highspeed: check for mmc as well as sd cards Thread-Topic: [PATCH] sdhci: highspeed: check for mmc as well as sd cards Thread-Index: ActliFBRP7ZucYVFQcKqkxFjWYNOcA== Message-ID: <41A82D88-6200-469C-986D-EF46B0C6A773@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 18:59:05 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d3f924b..1d3f4d8 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1194,8 +1194,9 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) else ctrl &= ~SDHCI_CTRL_4BITBUS; - if (ios->timing == MMC_TIMING_SD_HS && - !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) + if ((ios->timing == MMC_TIMING_SD_HS + || ios->timing == MMC_TIMING_MMC_HS) + && !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) ctrl |= SDHCI_CTRL_HISPD; else ctrl &= ~SDHCI_CTRL_HISPD;