From patchwork Mon Oct 31 02:49:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 9404975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC5B16022E for ; Mon, 31 Oct 2016 02:52:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE96928EF8 for ; Mon, 31 Oct 2016 02:52:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C258A28F1B; Mon, 31 Oct 2016 02:52:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EED328EF8 for ; Mon, 31 Oct 2016 02:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757927AbcJaCvs (ORCPT ); Sun, 30 Oct 2016 22:51:48 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:57221 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757929AbcJaCtt (ORCPT ); Sun, 30 Oct 2016 22:49:49 -0400 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OFW01W98566I1A0@mailout3.samsung.com>; Mon, 31 Oct 2016 11:49:45 +0900 (KST) X-AuditID: cbfee61b-f793d6d000005a2a-4e-5816b149c968 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 90.2F.23082.941B6185; Mon, 31 Oct 2016 11:49:45 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OFW004KW56WTX40@mmp1.samsung.com>; Mon, 31 Oct 2016 11:49:45 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org Cc: ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, john.stultz@linaro.org, guodong.xu@linaro.org, leo.yan@linaro.org, vincent.guittot@linaro.org, Jaehoon Chung Subject: [PATCH 2/2] mmc: dw_mmc: add the "reset" as name of reset controller Date: Mon, 31 Oct 2016 11:49:42 +0900 Message-id: <20161031024942.4415-3-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.1 In-reply-to: <20161031024942.4415-1-jh80.chung@samsung.com> References: <20161031024942.4415-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeLIzCtJLcpLzFFi42I5/e+xgK7nRrEIg0XvRS3mHznHavH/Tg+r xY1fbawWZ37rWkzeeonN4vKuOWwWR/73M1osvX6RyaJ17xF2i+Nrwy06jnxjduD2WDNvDaPH plWdbB53ru1h8+jbsorR4/MmuQDWKDebjNTElNQihdS85PyUzLx0W6XQEDddCyWFvMTcVFul CF3fkCAlhbLEnFIgz8gADTg4B7gHK+nbJbhlTDr6iK1gDkfF5fnL2BoYP7N1MXJySAiYSPw4 N50FwhaTuHBvPVCci0NIYCmjxJnFa5kgnB+MEucPQHSwCehIbP92nAnEFhGwlJj2ewE7SBGz wHtGiWV7GllBEsICvhJbllwAa2ARUJU4ceAYM4jNK2AlMfP+Y1aIdfISF66eAlvNKWAtcXja YrAaIaCar99fskxg5F3AyLCKUSK1ILmgOCk91ygvtVyvODG3uDQvXS85P3cTIzj0n0nvYDy8 y/0QowAHoxIP74IosQgh1sSy4srcQ4wSHMxKIrwla4FCvCmJlVWpRfnxRaU5qcWHGE2BDpvI LCWanA+My7ySeEMTcxNzYwMLc0tLEyMlcd7G2c/ChQTSE0tSs1NTC1KLYPqYODilGhjTHTR+ nwkvu16x94xflMnFfZZR7ZOC2KK7yxI27z+jp5/+VOli3cZLZrn3Xj0P2W+15ypbdtLEB9mb ZHzqF71Mrd6xd7r+xo4b1hydfS67174+k6fCvy40sF9BTeM/+6knVzZ7fmVLWXFCOW/ipj9s wQcm9/Ly7OlI6d1T5t6mqTh9xUIBkT1KLMUZiYZazEXFiQB8IFAxkwIAAA== X-MTR: 20000000000000000@CPGS Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the "reset" as name of reset controller. This is for preventing the wrong operation. Even if some SoC has reset controller, doesn't define "resets" in device-tree. Then it might be waiting for reset controller and it should be stuck. Fixes: d6786fefe816 ("mmc: dw_mmc: add reset support to dwmmc host controller") Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1c9ee36..a16c537 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2940,7 +2940,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) return ERR_PTR(-ENOMEM); /* find reset controller when exist */ - pdata->rstc = devm_reset_control_get_optional(dev, NULL); + pdata->rstc = devm_reset_control_get_optional(dev, "reset"); if (IS_ERR(pdata->rstc)) { if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER) return ERR_PTR(-EPROBE_DEFER);