From patchwork Sun Mar 6 08:47:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 63630 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp899798lbc; Sun, 6 Mar 2016 00:48:28 -0800 (PST) X-Received: by 10.98.13.21 with SMTP id v21mr2669811pfi.164.1457254107984; Sun, 06 Mar 2016 00:48:27 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vb13si11012283pab.68.2016.03.06.00.48.27; Sun, 06 Mar 2016 00:48:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751358AbcCFIsR (ORCPT + 6 others); Sun, 6 Mar 2016 03:48:17 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35946 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbcCFIsI (ORCPT ); Sun, 6 Mar 2016 03:48:08 -0500 Received: by mail-pa0-f42.google.com with SMTP id fi3so58340312pac.3 for ; Sun, 06 Mar 2016 00:48:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PBi6D8x/Iz08m6VmQCLngjx3bwmuakgbbtfRF490tyU=; b=aGCu7wuWvgu0BCQ6DRw5Fk7jo4imwTdqX6t+RFsgb+NWLtePOGIUSeN2p044Xpff1G tWxLGzuLIqX+80CUzg5MiztW/Mzto2lxSgDRWRjZLtogWAdJZvqGp909jilA5JIyc+GZ N/FplxDxyoScXPb9yLeDgN8C6kay/M12JFfMw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PBi6D8x/Iz08m6VmQCLngjx3bwmuakgbbtfRF490tyU=; b=lSzGK2glJq9xli1F0Z6HNopmqE802ctiau9bJfJphrX86KZPdCYG8yLaHxWE7PU+K+ W4ukEm3Na89gUytqujDBCz7qUEZaOxeX0x0bjZMkuz+Xk0xToMYmHkWEvF6wEXdbP7/z iRelb/utivC+yLq0si/YEahh96dy85iAEWh6jEs1hrswHTQfBbHpqnh7AcBXDQv4MLWY 48pQ+zexfXbHpme+AgGtQPIk3zcXKxDL8JW9eBeifxzeOitAFsAxEvhCWPURisW4wzg4 IPliwrf0ohMBgF6138iHeL4fDevH5ozKEuHWQO410knwNZVWwoSZJnmUTWFom9UiWQQ1 xy0Q== X-Gm-Message-State: AD7BkJKMLXHw2OLQsnV0K6/FIFo/mJUQftrTH92nLMFomWQoVSGxtwqUmswuiaFeHScq8KFU X-Received: by 10.66.124.226 with SMTP id ml2mr24966627pab.90.1457254087043; Sun, 06 Mar 2016 00:48:07 -0800 (PST) Received: from localhost.localdomain (110-170-137-3.static.asianet.co.th. [110.170.137.3]) by smtp.gmail.com with ESMTPSA id xa9sm16613411pab.44.2016.03.06.00.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 00:48:06 -0800 (PST) From: Guodong Xu To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, jh80.chung@samsung.com, ulf.hansson@linaro.org, shawn.lin@rock-chips.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Cc: Guodong Xu , Xinwei Kong , Zhangfei Gao Subject: [PATCH 2/2] mmc: dw_mmc: add resets support to dw_mmc Date: Sun, 6 Mar 2016 15:47:42 +0700 Message-Id: <1457254062-22677-2-git-send-email-guodong.xu@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457254062-22677-1-git-send-email-guodong.xu@linaro.org> References: <1457254062-22677-1-git-send-email-guodong.xu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org mmc registers may in abnormal state if mmc is used in bootloader, eg. to support booting from eMMC. So we need reset mmc registers when kernel boots up, instead of assuming mmc is in clean state. With this patch, user can add a 'resets' property into dw_mmc dts node. When driver parse_dt and probe, it calls reset API to deassert the 'reset' of dw_mmc host controller. When probe error or remove, it calls reset API to assert it. Please also refer to Documentation/devicetree/bindings/reset/reset.txt Signed-off-by: Guodong Xu Signed-off-by: Xinwei Kong Signed-off-by: Zhangfei Gao --- drivers/mmc/host/dw_mmc.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 242f9a0..281ea9c 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2878,6 +2878,14 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) if (!pdata) return ERR_PTR(-ENOMEM); + /* find reset controller when exist */ + pdata->rstc = devm_reset_control_get_optional(dev, NULL); + if (IS_ERR(pdata->rstc)) { + if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER) + return ERR_PTR(-EPROBE_DEFER); + pdata->rstc = NULL; + } + /* find out number of slots supported */ of_property_read_u32(np, "num-slots", &pdata->num_slots); @@ -2949,7 +2957,9 @@ int dw_mci_probe(struct dw_mci *host) if (!host->pdata) { host->pdata = dw_mci_parse_dt(host); - if (IS_ERR(host->pdata)) { + if (PTR_ERR(host->pdata) == -EPROBE_DEFER) + return -EPROBE_DEFER; + else if (IS_ERR(host->pdata)) { dev_err(host->dev, "platform data not available\n"); return -EINVAL; } @@ -3012,6 +3022,9 @@ int dw_mci_probe(struct dw_mci *host) } } + if (host->pdata->rstc != NULL) + reset_control_deassert(host->pdata->rstc); + setup_timer(&host->cmd11_timer, dw_mci_cmd11_timer, (unsigned long)host); @@ -3164,6 +3177,9 @@ err_dmaunmap: if (host->use_dma && host->dma_ops->exit) host->dma_ops->exit(host); + if (host->pdata->rstc != NULL) + reset_control_assert(host->pdata->rstc); + err_clk_ciu: if (!IS_ERR(host->ciu_clk)) clk_disable_unprepare(host->ciu_clk); @@ -3196,11 +3212,15 @@ void dw_mci_remove(struct dw_mci *host) if (host->use_dma && host->dma_ops->exit) host->dma_ops->exit(host); + if (host->pdata->rstc != NULL) + reset_control_assert(host->pdata->rstc); + if (!IS_ERR(host->ciu_clk)) clk_disable_unprepare(host->ciu_clk); if (!IS_ERR(host->biu_clk)) clk_disable_unprepare(host->biu_clk); + } EXPORT_SYMBOL(dw_mci_remove);