From patchwork Wed Aug 21 13:50:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seungwon Jeon X-Patchwork-Id: 2847748 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 B34B39F271 for ; Wed, 21 Aug 2013 13:50:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17BCC202B3 for ; Wed, 21 Aug 2013 13:50:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF674202AB for ; Wed, 21 Aug 2013 13:50:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751836Ab3HUNuS (ORCPT ); Wed, 21 Aug 2013 09:50:18 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:54804 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751719Ab3HUNuR (ORCPT ); Wed, 21 Aug 2013 09:50:17 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRV00LXBVRRM3C0@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Wed, 21 Aug 2013 22:50:15 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 77.4C.29708.795C4125; Wed, 21 Aug 2013 22:50:15 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-6c-5214c5979a82 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 49.1B.32250.795C4125; Wed, 21 Aug 2013 22:50:15 +0900 (KST) Received: from DOTGIHJUN01 ([12.23.118.161]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MRV001RGVRQP040@mmp2.samsung.com>; Wed, 21 Aug 2013 22:50:14 +0900 (KST) From: Seungwon Jeon To: linux-mmc@vger.kernel.org Cc: 'Chris Ball' , 'Jaehoon Chung' , 'Alim Akhtar' References: In-reply-to: Subject: [PATCH 05/14] mmc: dw_mmc: move supports-highspeed of quirks to caps Date: Wed, 21 Aug 2013 22:50:14 +0900 Message-id: <002a01ce9e75$5d15e000$1741a000$%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: Ac03z3aCvVFr8FaITt2vKVQKst76fw3OcIrwS9fJ1BA= Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsVy+t8zQ93pR0WCDP5M47Z4MG8bm8X21xvZ LG78amO1OPK/n9GBxePQlbWMHn1bVjF6fN4kF8AcxWWTkpqTWZZapG+XwJVx4c93xoJP3BVr d7SwNzB+5exi5OSQEDCRWD1hLiuELSZx4d56ti5GLg4hgWWMEn/vn2SEKXrx9AcrRGI6o8T1 DZ9ZIJw/jBJ3p6wBa2cT0JL4++YNM4gtIiAr8fPPBTYQm1mgTOLtnftAcQ6gBm6J1c1BIGFO AR6JdX86wcqFBXwlbredZgexWQRUJTrfvWECKecVsJWY+UofJMwrICjxY/I9FpAws4C6xJQp uRDD5SU2r3kLNlwCKPzory7EfiuJw8uPsEKUiEjse/GOEeRgCYFj7BJrLy+D2iQg8W3yIRaI XlmJTQeYIb6VlDi44gbLBEaJWUgWz0JYPAvJ4llINixgZFnFKJpakFxQnJReZKJXnJhbXJqX rpecn7uJERKFE3Yw3jtgfYgxGWj7RGYp0eR8YBTnlcQbGpsZWZiamBobmVuakSasJM6r3mId KCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoGxbVX2id1aOj2/+yfsuTjtokHPAqPN96KNPKfa 9mp+0/I6cNm+IcxTpmfZnq3BPikL9vdatb+RdeXoaZvx8ab0LfFd2/5+mxek5bOx/Pa15a+Z I0XE+/b/2HWcbRETp717i2BJzGdl55Duqcpm8Qp1HXu4UoK+d86YIP3332fDGBXZH4Zhb08r sRRnJBpqMRcVJwIAl/HMIdgCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEKsWRmVeSWpSXmKPExsVy+t9jQd3pR0WCDN5eYLd4MG8bm8X21xvZ LG78amO1OPK/n9GBxePQlbWMHn1bVjF6fN4kF8Ac1cBok5GamJJapJCal5yfkpmXbqvkHRzv HG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQO0TkmhLDGnFCgUkFhcrKRvh2lCaIibrgVMY4Su b0gQXI+RARpIWMeYceHPd8aCT9wVa3e0sDcwfuXsYuTkkBAwkXjx9AcrhC0mceHeerYuRi4O IYHpjBLXN3xmgXD+MErcnbIGrIpNQEvi75s3zCC2iICsxM8/F9hAbGaBMom3d+4DxTmAGrgl VjcHgYQ5BXgk1v3pBCsXFvCVuN12mh3EZhFQleh894YJpJxXwFZi5it9kDCvgKDEj8n3WEDC zALqElOm5EIMl5fYvOYt2HAJoPCjv7oQ+60kDi8/wgpRIiKx78U7xgmMQrOQDJqFMGgWkkGz kHQsYGRZxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iREc48+kdjCubLA4xCjAwajEw3thp0iQ EGtiWXFl7iFGCQ5mJRHez/uBQrwpiZVVqUX58UWlOanFhxiTgb6cyCwlmpwPTD95JfGGxiZm RpZGZhZGJubmpAkrifMeaLUOFBJITyxJzU5NLUgtgtnCxMEp1cA4e/qRcwmbDsTtr/dVf3Im aK/Xkw2mK6tiny+3MbNi9z3vmLPGuaFHyv7zSeG1qabd8q0XtrR+WMFmzOLxT75O2NIgX+U0 44Od524+43rzdMrPsy+/+WZsF7l1IYXxUNkNDyf/nzf6pdsW2PKka8meDoxN3nq1+GUe98Ot nrd0D+94fbdU0oBBiaU4I9FQi7moOBEAK5/PQjUDAAA= 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.7 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 --- 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 e8396f9..a1ce7c0 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1992,9 +1992,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; @@ -2129,9 +2126,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, }, @@ -2186,6 +2180,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;