From patchwork Fri Aug 30 15:13:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seungwon Jeon X-Patchwork-Id: 2852119 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D48BB9F2F4 for ; Fri, 30 Aug 2013 15:13:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96BD3204A3 for ; Fri, 30 Aug 2013 15:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33E1020488 for ; Fri, 30 Aug 2013 15:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756554Ab3H3PNY (ORCPT ); Fri, 30 Aug 2013 11:13:24 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:46317 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756321Ab3H3PNX (ORCPT ); Fri, 30 Aug 2013 11:13:23 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSC000AHNMBFUP0@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Sat, 31 Aug 2013 00:13:23 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id CD.3E.31253.396B0225; Sat, 31 Aug 2013 00:13:23 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-5d-5220b6932ea5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 03.FB.05832.296B0225; Sat, 31 Aug 2013 00:13:23 +0900 (KST) Received: from DOTGIHJUN01 ([12.23.118.161]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSC0017ENMAYA10@mmp1.samsung.com>; Sat, 31 Aug 2013 00:13:22 +0900 (KST) From: Seungwon Jeon To: linux-mmc@vger.kernel.org Cc: 'Chris Ball' , 'Jaehoon Chung' References: In-reply-to: Subject: [PATCH 13/22] mmc: dw_mmc: move supports-highspeed of quirks to caps Date: Sat, 31 Aug 2013 00:13:22 +0900 Message-id: <001001cea593$77bbb950$67332bf0$%jun@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac03z3aCvVFr8FaITt2vKVQKst76fw3OcIrwS9fJ1BAByUIdcA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsVy+t8zfd3J2xSCDB7/YLHY/nojm8WNX22s Fkf+9zM6MHscurKW0aNvyypGj8+b5AKYo7hsUlJzMstSi/TtErgyrnYfYSxYwlNxdpZFA+Mi ri5GTg4JAROJa3PmM0PYYhIX7q1n62Lk4hASWMYocX/SbkaYosWnv0ElFjFKrDv+kRHC+cMo 8bi/iR2kik1AS+Lvmzdgo0QEZCV+/rnABmIzC3hLvJq/BqiBA6iBW2J1cxBImFOAR2Ldn06w cmEBX4nNM86D2SwCqhLbzzazgti8ArYSP7dvZ4OwBSV+TL7HAjKGWUBdYsqUXIjp8hKb17xl BglLAIUf/dWFOMBJ4mzTQUaIEhGJfS/egV0sIbCLXWLZrSdsEKsEJL5NPsQC0SsrsekANBwk JQ6uuMEygVFiFpLFsxAWz0KyeBaSDQsYWVYxiqYWJBcUJ6UXmegVJ+YWl+al6yXn525ihMTe hB2M9w5YH2JMBto+kVlKNDkfGLt5JfGGxmZGFqYmpsZG5pZmpAkrifOqt1gHCgmkJ5akZqem FqQWxReV5qQWH2Jk4uCUamD0FJyp6HtdYsvD4/sP617Scui78f6OzFSXh8y81k7vgw/t5fNp /3TudsDCNbMCXFp7/xWfDBCRmKxTGNzgzxqz4ORG4bA3D94cOSn51WH5JkPe2AXVYQ+NpCLc 2DR3zlr1ap5QxIeZqpLnjnZZlD6+suRhS2HM/zUrYuy3KyyxqbmxaIVN8u0+JZbijERDLeai 4kQAtiVeFdMCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsVy+t9jAd3J2xSCDNrWMFpsf72RzeLGrzZW iyP/+xkdmD0OXVnL6NG3ZRWjx+dNcgHMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaG uoaWFuZKCnmJuam2Si4+AbpumTlAm5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUY GaCBhHWMGVe7jzAWLOGpODvLooFxEVcXIyeHhICJxOLT39ggbDGJC/fWA9lcHEICixgl1h3/ yAjh/GGUeNzfxA5SxSagJfH3zRtmEFtEQFbi558LYN3MAt4Sr+avAWrgAGrglljdHAQS5hTg kVj3pxOsXFjAV2LzjPNgNouAqsT2s82sIDavgK3Ez+3b2SBsQYkfk++xgIxhFlCXmDIlF2K6 vMTmNW+ZQcISQOFHf3UhDnCSONt0kBGiRERi34t3jBMYhWYhGTQLYdAsJINmIelYwMiyilE0 tSC5oDgpPddIrzgxt7g0L10vOT93EyM4sp9J72Bc1WBxiFGAg1GJh3fncoUgIdbEsuLK3EOM EhzMSiK8HxcDhXhTEiurUovy44tKc1KLDzEmA705kVlKNDkfmHTySuINjU3MjCyNzCyMTMzN SRNWEuc92GodKCSQnliSmp2aWpBaBLOFiYNTCpjA8o9qeHr8PRh5eEcJ9+IDNh/T7TXSg2yN D551nb51adDa38rCBdLajhnTEvp8TmsqO9w1PRS1QmxF1nzrgEcsV+yXhpinPfU3rr3w2Kls VuHL1skyxf37Aj/cvqjAvbj/2a/w1hL1R9GSxnsOXLDlrfuz9Rvfws9Flroi+cdd5V6eciwX vKbEUpyRaKjFXFScCACgHEmhMAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'supports-highspeed' is not one of the quirks but is a capability. So, it's removed from quirks. Signed-off-by: Seungwon Jeon Tested-by: Alim Akhtar --- drivers/mmc/host/dw_mmc.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5f30df9..7c7cfa2 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1999,9 +1999,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) mmc->caps |= MMC_CAP_4_BIT_DATA; } - if (host->pdata->quirks & DW_MCI_QUIRK_HIGHSPEED) - mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; - if (host->pdata->blk_settings) { mmc->max_segs = host->pdata->blk_settings->max_segs; mmc->max_blk_size = host->pdata->blk_settings->max_blk_size; @@ -2130,9 +2127,6 @@ static struct dw_mci_of_quirks { int id; } of_quirks[] = { { - .quirk = "supports-highspeed", - .id = DW_MCI_QUIRK_HIGHSPEED, - }, { .quirk = "broken-cd", .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, }, @@ -2187,6 +2181,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) if (of_find_property(np, "enable-sdio-wakeup", NULL)) pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; + if (of_find_property(np, "supports-highspeed", NULL)) + pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; + if (of_find_property(np, "caps2-mmc-hs200-1_8v", NULL)) pdata->caps2 |= MMC_CAP2_HS200_1_8V_SDR;