From patchwork Thu Apr 26 10:38:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10365513 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 197EA601BE for ; Thu, 26 Apr 2018 10:53:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0755D28884 for ; Thu, 26 Apr 2018 10:53:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F04D6288C4; Thu, 26 Apr 2018 10:53:53 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D28728884 for ; Thu, 26 Apr 2018 10:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ZT0j4+teQbVztq2NlInsCSGdEaAKLgjkE9lPJQFuGaM=; b=Nl0 wkpHLC3lcA/3J5ckcVprFh0mJOQgIu3eYnBOduc2paGQvEJCeKfzr76r6GqAoqiKAxSs7YXnqDwxf fLUa0T6lryocKPQRQwQD1U52409xl0AAB3piwpXke8O7xBT0gsmP+NKLeRDY36RBI2x6vR92Qqa4X w/40kzP/nZ7D0k+QdMuXVq/vHqKU+/tW7Xr2GjPeFlDWlAMO9m6Z5SP8FDKTyR8lo+ysCG2y86Qqx b5h+2NhZvNRF7trqvm/I3Q8cmzL8Ln+50H96T3+dsLS/5uxveXT0uIV3ZeIt1klLbj/kgH+z1gVh6 /4EsLilWFfm9+5p38unXN8rqLFyXcTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBeX6-00078u-4E; Thu, 26 Apr 2018 10:53:48 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBeIX-0004nT-A5 for linux-amlogic@lists.infradead.org; Thu, 26 Apr 2018 10:39:06 +0000 Received: by mail-wr0-x242.google.com with SMTP id u18-v6so28989548wrg.3 for ; Thu, 26 Apr 2018 03:38:31 -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; bh=otkesq/ghJ+/1s5Fl5F1qM2pKXNxHAEIQUr9kpbG7/k=; b=pgFZ97uj75QZj34zgcOf/yqpc9fpumhrh8SxayiLPD8KaxJmdE6gxaOgvxa9E6fg8E R0iIvDXagN/UDLxDzaqUIrUNhRMaOBk5mRBnDJfA80fY/q0s0Htd1FMkmmzfThItV090 Vu/k+ljexp+6zU62e64nur6e8xt/UrcgIKiBueY57jEKvJUgvsDpcE4RT++3fpuUKXMb 51g9ixxtV5xW1cHMqewTfY73XidKH2wcmMdJFPMup9bVGsiDo738UgHeRUSzzmVOcigm Wtn/ZmGGDPuGWf0Eht2OoQzkOyAvgHuDkRPM9kCrl5LaXnb+YZCr33dll8wortGr01vu rmPQ== 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; bh=otkesq/ghJ+/1s5Fl5F1qM2pKXNxHAEIQUr9kpbG7/k=; b=mU4ClrIYNzaAi1P6CSy7pt696MgUmYkhN2A/5rT6veg42Cr1gJOiOODSw5rM74NzSw W+Hm/++aAfHDL1ezMhhbW6b6NN9GlunsD3WTibuYKt88pejMEIibvlTUGw4dc0TbjITP /bok9ZNYshmjXrhCcfppIOgnw97IP+Wji/4U+CcTmeJLhRaHq23rpP7e/75uZ8r3tCnT m5f0/nR+OAvZobhJQnYWruQO+Y7UaNT7CALwUiLOw9VbWleIjkUjhWnnxKFR8DNzie/Y UCCG1nNAdCbpExvnvQZD7V1ZBVxSWoDww+PZhORLeWUVaMWpl0XgyMki89BP7m38mWoj IvuQ== X-Gm-Message-State: ALQs6tD9X4PJW08aSVRyY0tk3jvkURBVRW/xf/rfVC36P0Ofhe1lA5U9 Z2xRmKTx2A9hAfS6FgeVqNPP9A== X-Google-Smtp-Source: AIpwx4/ASSF+EHigCzWUh1Hm7ev3gcVREx2IqzxR9fQOaJGeCY2c1Uu6nIi7kQN5CuIyQ0n+nhUykQ== X-Received: by 2002:adf:ab0a:: with SMTP id q10-v6mr26937385wrc.239.1524739106238; Thu, 26 Apr 2018 03:38:26 -0700 (PDT) Received: from boomer.baylibre.local ([2a01:e34:eeb6:4690:3146:aafc:91d9:4b96]) by smtp.googlemail.com with ESMTPSA id a10-v6sm30354143wri.10.2018.04.26.03.38.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Apr 2018 03:38:25 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Carlo Caione , Kevin Hilman Subject: [PATCH] mmc: meson-gx: add device reset Date: Thu, 26 Apr 2018 12:38:17 +0200 Message-Id: <20180426103817.12675-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_033845_441568_B6400E57 X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.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 node have the reset property Signed-off-by: Jerome Brunet Reviewed-by: Kevin Hilman --- Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 ++ drivers/mmc/host/meson-gx-mmc.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt index 5add8d7d855f..ba434375e7f2 100644 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt @@ -20,6 +20,7 @@ Required properties: "clkin1" - Other parent clock of internal mux The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the clock rate requested by the MMC core. +- reset : phandle of the internal reset line Example: @@ -30,4 +31,5 @@ Example: clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; pinctrl-0 = <&emmc_pins>; + resets = <&reset RESET_SD_EMMC_A>; }; diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 55bbd67177df..9d214622c8cf 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 @@ -1212,6 +1213,11 @@ 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); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(host->regs)) {