From patchwork Thu Jul 10 09:48:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4522601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6B559BEEAA for ; Thu, 10 Jul 2014 09:51:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9E7020158 for ; Thu, 10 Jul 2014 09:51:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7F4F20122 for ; Thu, 10 Jul 2014 09:51:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X5Ayr-0004Em-Q6; Thu, 10 Jul 2014 09:49:33 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X5AyQ-0003y0-Gm for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2014 09:49:07 +0000 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8H009YKPX4XY80@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2014 18:48:40 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.116]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 87.70.24374.7716EB35; Thu, 10 Jul 2014 18:48:40 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-13-53be6177cc92 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 2E.E1.04943.7716EB35; Thu, 10 Jul 2014 18:48:39 +0900 (KST) Received: from localhost.localdomain ([10.252.81.186]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8H001N4PX3ZN30@mmp1.samsung.com>; Thu, 10 Jul 2014 18:48:39 +0900 (KST) From: Jaehoon Chung To: linux-mmc Subject: [PATCHv4 5/5] mmc: dw_mmc: replace "disable-wp" from slot's quirk to host's quirk Date: Thu, 10 Jul 2014 18:48:38 +0900 Message-id: <1404985718-12203-6-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404985718-12203-1-git-send-email-jh80.chung@samsung.com> References: <1404985718-12203-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWyRsSkRLcicV+wQVuOxYTL2xkt5h85x2px /NJiZov/j16zWtz41cZq0bvgKpvFpsfXWC2O/O9ntJhxfh+TxdLrF5ksPty/yGxxfG24A49H 694JbB5r5q1h9LhzbQ+bx+Yl9R43Xi1k8ujbsorRY/u1ecwenzfJBXBEcdmkpOZklqUW6dsl cGXsPzKfqWAud0Vr62+WBsZZnF2MHBwSAiYS3y8KdzFyApliEhfurWfrYuTiEBJYyigx7+8k VoiEicSp1ZOYIBKLGCX2vXvNDuG0MUnsXb+aBaSKTUBHYvu340wgtoiApkTn9pVgo5gFrjBJ nL2zBWyUsECMxJHGm+wgNouAqsTTtceYQWxeATeJVRPWs0KcpCAxZ5INSJhTwF1i4ftrYDOF gEr2T53MDHHRNXaJB8c0IcYISHybfIgFolVWYtMBqBJJiYMrbrBMYBRewMiwilE0tSC5oDgp vchQrzgxt7g0L10vOT93EyMwXk7/e9a7g/H2AetDjMlA4yYyS4km5wPjLa8k3tDYzMjC1MTU 2Mjc0ow0YSVx3qSHSUFCAumJJanZqakFqUXxRaU5qcWHGJk4OKUaGD0Fb5b5VujscghwFJu5 VFjY/kV333ffyqXfj9x+ZrFg4QXnFp5DjeltGvPkt/6rfr5ulUGAuYTi6dWOt+9I8rd1JGpN +fBM6bSpsVvPrLknH+UviWG9HGVieOxaRth7xRmzJ8Uc3cT/47hq8d19r9+FeO76brlfLF4+ 809AUEy0pfba1qjTRkosxRmJhlrMRcWJADt0QGOtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t9jAd3yxH3BBvd7zCwmXN7OaDH/yDlW i+OXFjNb/H/0mtXixq82VoveBVfZLDY9vsZqceR/P6PFjPP7mCyWXr/IZPHh/kVmi+Nrwx14 PFr3TmDzWDNvDaPHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j9vi8SS6AI6qB0SYjNTEltUgh NS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6FolhbLEnFKgUEBicbGS vh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8b+I/OZCuZyV7S2/mZpYJzF2cXIySEhYCJxavUk JghbTOLCvfVsXYxcHEICixgl9r17zQ7htDFJ7F2/mgWkik1AR2L7t+NgHSICmhKd21eCdTAL XGGSOHtnCytIQlggRuJI4012EJtFQFXi6dpjzCA2r4CbxKoJ64FqOIDWKUjMmWQDEuYUcJdY +P4a2EwhoJL9UyczT2DkXcDIsIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMjOCafSe1gXNlg cYhRgINRiYe3oWdvsBBrYllxZe4hRgkOZiUR3m12+4KFeFMSK6tSi/Lji0pzUosPMZoCHTWR WUo0OR+YLvJK4g2NTcyMLI3MDS2MjM2VxHkPtFoHCgmkJ5akZqemFqQWwfQxcXBKNTA6zj+d snfhl++B/AX2eZ5m95+e3ZM8dcaZNe8kj090+Mv3TiXvyYWX57TVgu+VSW8IPrTdwnCq+C/j +O8n3lSc7+6de+2/Bi/fdbMJbKvV7uYG33GXY2pftrl0NWOH/+LPx+L1evfPfviOJfTp9DU1 1lzljT0VDEFPls2eyPakeHF2tsuxtoi1SizFGYmGWsxFxYkA25VKX98CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140710_024906_753361_91A5D8E9 X-CRM114-Status: GOOD ( 11.07 ) X-Spam-Score: -5.7 (-----) Cc: Mark Rutland , devicetree@vger.kernel.org, Ulf Hansson , kgene.kim@samsung.com, heiko@sntech.de, tgih.jun@samsung.com, Chris Ball , Jaehoon Chung , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dinguyen@altera.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,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 Replaced the "disable-wp" into host's quirks. (Because the slot-node is removed at dt-file.) Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1ac227c..aa29dc4 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -997,7 +997,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc) int gpio_ro = mmc_gpio_get_ro(mmc); /* Use platform get_ro function, else try on board write protect */ - if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) + if (slot->host->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) read_only = 0; else if (!IS_ERR_VALUE(gpio_ro)) read_only = gpio_ro; @@ -2006,12 +2006,7 @@ static struct device_node *dw_mci_of_find_slot_node(struct device *dev, u8 slot) static struct dw_mci_of_slot_quirks { char *quirk; int id; -} of_slot_quirks[] = { - { - .quirk = "disable-wp", - .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, - }, -}; +} of_slot_quirks[] = {}; static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot) { @@ -2238,6 +2233,9 @@ static struct dw_mci_of_quirks { { .quirk = "broken-cd", .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, + }, { + .quirk = "disable-wp", + .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, }, };