From patchwork Thu Nov 15 08:15:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 1747451 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B8A9EDF2AB for ; Thu, 15 Nov 2012 08:15:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751695Ab2KOIPl (ORCPT ); Thu, 15 Nov 2012 03:15:41 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:27251 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750801Ab2KOIPk (ORCPT ); Thu, 15 Nov 2012 03:15:40 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDI00J2NS9EFU30@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Thu, 15 Nov 2012 17:15:38 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.45]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 4F.86.12699.AA4A4A05; Thu, 15 Nov 2012 17:15:38 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-2e-50a4a4aad579 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 0F.86.12699.AA4A4A05; Thu, 15 Nov 2012 17:15:38 +0900 (KST) Received: from [10.90.51.55] by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDI00D5HSA14G90@mmp2.samsung.com> for linux-mmc@vger.kernel.org; Thu, 15 Nov 2012 17:15:38 +0900 (KST) Message-id: <50A4A4A3.90903@samsung.com> Date: Thu, 15 Nov 2012 17:15:31 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-version: 1.0 To: linux-mmc Cc: Chris Ball , Kyungmin Park Subject: [PATCH] mmc: sdhci: check the quirk HISPD_BIT for SD3.0 card Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+Zru6qJUsCDF516lgc+d/P6MDo8XmT XABjFJdNSmpOZllqkb5dAlfGlWffmAtuclY8fLOFtYHxG3sXIyeHhICJxJQLa1kgbDGJC/fW s3UxcnEICSxjlNj/egKQwwFWtOBNKkR8OqNE15flLBBOO5PEl99z2EC6eQU0JBZsvsoMYrMI qEr8+rYTLM4moCOx/dtxJpBBogJhEjs3p0OUC0r8mHwPbLGIgKZE5/aVYOXMAl4SL99OYwSx hQVcJS5962CCiOtI7G+dBlUjL7F5zVuoVQIS3yYfYoG4U1Zi0wFmkNMkBF6zSTybfosR4jFJ iYMrbrBMYBSZhWT1LCRjZyEZu4CReRWjaGpBckFxUnqukV5xYm5xaV66XnJ+7iZGSIBL72Bc 1WBxiFGAg1GJh9fi4+IAIdbEsuLK3EOMEhzMSiK8Lw4ChXhTEiurUovy44tKc1KLDzH6AF07 kVlKNDkfGH15JfGGxgbGhoaWhmamlqYGOISVxHmbPVIChATSE0tSs1NTC1KLYMYxcXBKNTAK L3PJ3rRg3dnNk6bNeNbxd62I90El5amWayYf8PfjNFm42nfew2cFoqu3vPi9xYDFWCVpuSyH V9STSzPFFtzi0my/eI/BfNJFjbNC+491nHnGkHEpfd3CecwtS7U5bk3rvh2+v8v2yo9XPiv9 73P275M62L/ENeyC+Za+yzY7mE5YJl+LcHwRpsRSnJFoqMVcVJwIAO/Lw2edAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsVy+t9jQd1VS5YEGBx7qGJx5H8/owOjx+dN cgGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGVeefWMuuMlZ8fDNFtYG xm/sXYwcHBICJhIL3qR2MXICmWISF+6tZ+ti5OIQEpjOKNH1ZTkLhNPOJPHl9xw2kCpeAQ2J BZuvMoPYLAKqEr++7QSLswnoSGz/dpwJZKioQJjEzs3pEOWCEj8m32MBsUUENCU6t68EK2cW 8JJ4+XYaI4gtLOAqcelbBxNEXEdif+s0qBp5ic1r3jJPYOSbhWTULCRls5CULWBkXsUomlqQ XFCclJ5rpFecmFtcmpeul5yfu4kRHD/PpHcwrmqwOMQowMGoxMNr8XFxgBBrYllxZe4hRgkO ZiUR3hcHgUK8KYmVValF+fFFpTmpxYcYfYAencgsJZqcD4ztvJJ4Q2MTMyNLIzNjE3NjYxzC SuK8zR4pAUIC6YklqdmpqQWpRTDjmDg4pRoY9fLf3rrjlhv7wVvlZ7JGda5I8BrGNT0V8x8F H3vCwjWB9+HrdTotlsf2SGrzsRUlZ6+zU1/99MTPvJ8pb79VpDU6c5Z/z3d5NvEDh8VhR/1m 3/XpHMtVGi+aPyrYlH7vzW6mmaFu8jvft92clmrxhXEyY/CP9gzxuAvv2i1WV0xwcBEz7GFQ YinOSDTUYi4qTgQAW6ttmcwCAAA= X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org If SD-card is more than SD3.0 card, set to ctrl with UHS-I modes. But in case of Samsung-SoC, didn't use the SDHCI_CTRL_HISPD. So need to check the quirk for SDHCI_QUIRK_NO_HISPD_BIT. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park --- drivers/mmc/host/sdhci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6f6534e..b42d551 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1418,11 +1418,12 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) unsigned int clock; /* In case of UHS-I modes, set High Speed Enable */ - if ((ios->timing == MMC_TIMING_MMC_HS200) || + if (((ios->timing == MMC_TIMING_MMC_HS200) || (ios->timing == MMC_TIMING_UHS_SDR50) || (ios->timing == MMC_TIMING_UHS_SDR104) || (ios->timing == MMC_TIMING_UHS_DDR50) || - (ios->timing == MMC_TIMING_UHS_SDR25)) + (ios->timing == MMC_TIMING_UHS_SDR25)) && + !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) ctrl |= SDHCI_CTRL_HISPD; ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);