From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FC61C2BA19 for ; Sat, 11 Apr 2020 23:41:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60384206E9 for ; Sat, 11 Apr 2020 23:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586648467; bh=CoNRyxANqknyvtD2tPaGjioGwzJ8nFozoxNEckOKVls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FQKphI6CX2nvBw3njdVBu01EdBzedoNboob0dl6eK9jAufP+yFvfUoTyXs7m+Kfxw aQZgjSCM2M3P/jjjooElhfqKEDjBjRoCvMJFGgaPv02PFj2ZfxTVgeeiIi+xwQhFQe W2P4zfaRILWKid3ByiJ1LfPn2ZLYPlBTl/7nt8JA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730559AbgDKXlF (ORCPT ); Sat, 11 Apr 2020 19:41:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:42936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728594AbgDKXHO (ORCPT ); Sat, 11 Apr 2020 19:07:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 785FC20787; Sat, 11 Apr 2020 23:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646434; bh=CoNRyxANqknyvtD2tPaGjioGwzJ8nFozoxNEckOKVls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wf8L2xUNrjxgwMdYehzWf8zO70510H8atn+KdHQGlgg1x++KwBokW3jTVbL+LWi3P UlMusHT1jZWtlD0k/u1FNvCAirgKOWQjVxWDb7x/4OXxrzrP5yJrwo7YVGGvClJThK P5OUCWUv5qXcsXSYI7zBopbrO4an6+NZuhvDTFmM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haibo Chen , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.5 006/121] mmc: sdhci-esdhc-imx: restore pin state when resume back Date: Sat, 11 Apr 2020 19:05:11 -0400 Message-Id: <20200411230706.23855-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230706.23855-1-sashal@kernel.org> References: <20200411230706.23855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haibo Chen [ Upstream commit af8fade4bd7bc7bf49851832a20166213e032978 ] In some low power mode, SoC will lose the pin state, so need to restore the pin state when resume back. Signed-off-by: Haibo Chen Link: https://lore.kernel.org/r/1582100757-20683-8-git-send-email-haibo.chen@nxp.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-esdhc-imx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index dccb4df465126..ca1566d4ccab1 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1624,7 +1624,11 @@ static int sdhci_esdhc_suspend(struct device *dev) if (host->tuning_mode != SDHCI_TUNING_MODE_3) mmc_retune_needed(host->mmc); - return sdhci_suspend_host(host); + ret = sdhci_suspend_host(host); + if (!ret) + return pinctrl_pm_select_sleep_state(dev); + + return ret; } static int sdhci_esdhc_resume(struct device *dev) @@ -1632,6 +1636,10 @@ static int sdhci_esdhc_resume(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); int ret; + ret = pinctrl_pm_select_default_state(dev); + if (ret) + return ret; + /* re-initialize hw state in case it's lost in low power mode */ sdhci_esdhc_imx_hwinit(host); -- 2.20.1