From patchwork Mon Jun 30 11:49:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4447671 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 9F985BEEAA for ; Mon, 30 Jun 2014 11:52:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2AFE2035C for ; Mon, 30 Jun 2014 11:52:37 +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 E523820256 for ; Mon, 30 Jun 2014 11:52:35 +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 1X1a6l-00053G-Ee; Mon, 30 Jun 2014 11:50:51 +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 1X1a5k-0003RJ-0o for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 11:49:48 +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 <0N7Z00CPNCU9ECC0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 20:49:22 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 17.62.24374.1CE41B35; Mon, 30 Jun 2014 20:49:21 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-f2-53b14ec1553a Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 3C.B5.04943.1CE41B35; Mon, 30 Jun 2014 20:49:21 +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 <0N7Z00M3ICU8GQ30@mmp1.samsung.com>; Mon, 30 Jun 2014 20:49:21 +0900 (KST) From: Jaehoon Chung To: linux-mmc Subject: [PATCHv2 5/5] mmc: dw_mmc: replace "disable-wp" from slot's quirk to host's quirk Date: Mon, 30 Jun 2014 20:49:19 +0900 Message-id: <1404128960-27225-6-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404128960-27225-1-git-send-email-jh80.chung@samsung.com> References: <1404128960-27225-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkQPeg38Zgg/9PzC0mXN7OaDH/yDlW i+OXFjNb/H/0mtXixq82VoveBVfZLDY9vsZqceR/P6PFjPP7mCyWXr/IZPHh/kVmi+Nrwx14 PFr3TmDzWDNvDaPHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j9vi8SS6AI4rLJiU1J7MstUjf LoEr43J7K0tBD0/F3ocmDYyfObsYOTkkBEwkvh7ewgZhi0lcuLceyObiEBJYyijRvmoGC0zR mjsbGSESixglOg+/Z4Zw2pgkln36yARSxSagI7H923EwW0RAU6Jz+0qwUcwCV5gkzt7ZwtrF yMEhLBAjceOIKEgNi4CqxLb319lBbF4BN4njixYwgZRICChIzJlkAxLmFHCXaN4zjRnEFgIq md37CWykhMA1dol1W1tYIOYISHybfIgFoldWYtMBZoijJSUOrrjBMoFReAEjwypG0dSC5ILi pPQiQ73ixNzi0rx0veT83E2MwIg5/e9Z7w7G2wesDzEmA42byCwlmpwPjLi8knhDYzMjC1MT U2Mjc0sz0oSVxHmTHiYFCQmkJ5akZqemFqQWxReV5qQWH2Jk4uCUamB8kO8n6pF+urjOTGOZ +beDkRHXd89+e+qod3+6fXOt4n+Wmm7JQukHK6si5k75USezLuLXjKX673gLcnPL7+6auNXw 0JbN6WmGN4TshU9UcazvXO98W4X3OMOXt+lfjiw93xbWd23SEhOhfK6Yz9O5lZNz8/5l7Naz vmF5JMSmz2rXvBXhBspKLMUZiYZazEXFiQAHFjMkrgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t9jAd2DfhuDDZa917eYcHk7o8X8I+dY LY5fWsxs8f/Ra1aLG7/aWC16F1xls9j0+BqrxZH//YwWM87vY7JYev0ik8WH+xeZLY6vDXfg 8WjdO4HNY828NYwed67tYfPYvKTe48arhUwefVtWMXpsvzaP2ePzJrkAjqgGRpuM1MSU1CKF 1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoGuVFMoSc0qBQgGJxcVK +naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBmX21tZCnp4KvY+NGlg/MzZxcjJISFgIrHmzkZG CFtM4sK99WxdjFwcQgKLGCU6D79nhnDamCSWffrIBFLFJqAjsf3bcTBbREBTonP7SrAOZoEr TBJn72xh7WLk4BAWiJG4cUQUpIZFQFVi2/vr7CA2r4CbxPFFC5hASiQEFCTmTLIBCXMKuEs0 75nGDGILAZXM7v3ENoGRdwEjwypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2M4Hh8JrWDcWWD xSFGAQ5GJR5ejWUbgoVYE8uKK3MPMUpwMCuJ8N702RgsxJuSWFmVWpQfX1Sak1p8iNEU6KiJ zFKiyfnAVJFXEm9obGJmZGlkbmhhZGyuJM57oNU6UEggPbEkNTs1tSC1CKaPiYNTqoGx6VWs vEhdn5mz1nG9ZSL377b7fDVvdVWa9t3MfdO7Dcf+mTIFL0o22Btxs/aynfvXNuFvldnTeX5K TPi26O3vGnUhhyv7HvS8Oag2T9NlZWTFj+jDCzNvXTBU4e8w9HJc+C3m3JMziiuYvvnWng/9 Ontvfq+Z3tGs7QtrLqWoP2w+s09gcelrJZbijERDLeai4kQAjST1KN0CAAA= 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-20140630_044948_316339_590B334A X-CRM114-Status: GOOD ( 11.40 ) X-Spam-Score: -5.0 (-----) 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=-1.9 required=5.0 tests=BAYES_00, T_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 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1ac227c..6c5d696 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -994,10 +994,11 @@ static int dw_mci_get_ro(struct mmc_host *mmc) { int read_only; struct dw_mci_slot *slot = mmc_priv(mmc); + struct dw_mci_board *brd = slot->host->pdata; 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 (brd->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) read_only = 0; else if (!IS_ERR_VALUE(gpio_ro)) read_only = gpio_ro; @@ -2006,12 +2007,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 +2234,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, }, };