From patchwork Tue May 15 09:57:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10400763 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 4F3E8601C8 for ; Tue, 15 May 2018 09:58:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3784227F54 for ; Tue, 15 May 2018 09:58:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C4EF28451; Tue, 15 May 2018 09:58:40 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 D05202841D for ; Tue, 15 May 2018 09:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730AbeEOJ6H (ORCPT ); Tue, 15 May 2018 05:58:07 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:43418 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbeEOJ6E (ORCPT ); Tue, 15 May 2018 05:58:04 -0400 Received: by mail-wr0-f196.google.com with SMTP id v15-v6so15324858wrm.10 for ; Tue, 15 May 2018 02:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tl/9E1K1OryN0PETVZ1inEtz97OJCjMyjmQFpnztezQ=; b=gLaK9UzCSXl8xeoYWpV2UzaIvHo+qgXDTWNPJPFygsVtrjN6zZL8fLK3ac4NUCjvck 0QmIQFEqX0co8xZCh+yjbNsCvb/bLF/F8TVO/HqeQYSMYJQtXRZ2Gai24zXZkp8atPWu e74JNmPbEEes4rFrMDvmZxeu1oYFtW+jiglgPwev5o/lyWvz0Nid/LaWWT7DGISax02f My5Fmag5Yv3CT8Z0Ch3WU4gJt7aoXASBHiPPV/G3KEy5c2zJCEmKSOOtRxy/+325vaxM bfBkOkwgJpNMSey3iz4y/LkXMBYZT4E6W5jYi/9lZTRovylgokCJYaR9VYKiqpRxBEa8 rV0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tl/9E1K1OryN0PETVZ1inEtz97OJCjMyjmQFpnztezQ=; b=KkEPL3DkFDs55xpuZZWbWmTaUT3eAOHxGJ9/rhAqb4yQSL8ALg3s5fsSrXpY9sufQV MlL4ctQZNLogYIQKta5e88Aapjam5v+QAL77S4sLZUD81k8X/s8fIDNprkEYQVMJ55M5 QWCI9tPPCZriqmPeZ/VwFhlzOwlf1urZBYT6ZnTkk0vGBPlg0zZBR96IQZ7vnZf43mF8 +1eKfIbeAJD8UgHItWSA4xiKW/4pRt4ml3pYtD3Rkc/lRPOPqbw16w7PoR1Pbu1XI8zf p5I7u6PdmTZbBF6qelkm2I1rBXlzA07RK6Oxm93h3cpEaHmIxMqpBPuqM7M8fjwmites rMvA== X-Gm-Message-State: ALKqPwe3Gu0il4YLjexY2sR9JXcSF7MXI37w+qwJ7PdmFeJSW41UMciz oKGkbV0QiOWa8XpnH1IVDwSlog== X-Google-Smtp-Source: AB8JxZol/kxSwZhCf3wzwiXFq/kVbSmFTYjDJvyQlp//y6PiBq+RzCQTNBH7U2zSe9V7oTx4Nqz2zg== X-Received: by 2002:adf:c88c:: with SMTP id k12-v6mr10518523wrh.6.1526378283394; Tue, 15 May 2018 02:58:03 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id 75-v6sm17253263wmw.37.2018.05.15.02.58.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 02:58:02 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mmc: meson-gx: add device reset Date: Tue, 15 May 2018 11:57:48 +0200 Message-Id: <20180515095748.6794-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180515095748.6794-1-jbrunet@baylibre.com> References: <20180515095748.6794-1-jbrunet@baylibre.com> 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 Trigger the reset line of the mmc controller while probing, if available. The reset should be optional for now, at least until all related DT nodes have the reset property. Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 4f972b879fe6..9bca359f7936 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -1184,6 +1185,14 @@ static int meson_mmc_probe(struct platform_device *pdev) goto free_host; } + ret = device_reset_optional(&pdev->dev); + if (ret) { + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "device reset failed: %d\n", ret); + + return ret; + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(host->regs)) {