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 7D077C433E2 for ; Thu, 18 Jun 2020 02:15:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58CA72070A for ; Thu, 18 Jun 2020 02:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592446521; bh=URc4789k/5yNLxNApylXOdyYnfGKoDQJ73exVVOeipg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zgQTI/ZUASAYdEzuy+osOdZUvdliUF0deNSjbl2WU0UUo4o0RmAKBXi6HyloDq6uw 8YEXqBGgLPtb1vwxWd97oWE8Lw7bhTiTrGJQsVOfZpZOZQcuiDJaSjGsBei/XZ5xbo OWylsp+8BP9ezSFALgBoKVcgUzThILxZrOhGRQBM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729392AbgFRBUf (ORCPT ); Wed, 17 Jun 2020 21:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:52760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729938AbgFRBUd (ORCPT ); Wed, 17 Jun 2020 21:20:33 -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 CD7D720CC7; Thu, 18 Jun 2020 01:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443233; bh=URc4789k/5yNLxNApylXOdyYnfGKoDQJ73exVVOeipg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D6BRTPGJoDFLFemKW65fpcDaOzdAKzHU7h/5zTeDa5g+mtVbfD5/ZYSeqZsWwouyK DTuzm4O7PUn+7TSjRzz6FF1mk4mkzA6LzG6y9L0LSsCXj8lT5xeKEibAzyn1c0HOu7 gn+ixbTRVitHE/NnJwEvOn820bsFc1r2srJ32s/4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Amelie Delaunay , Lee Jones , Sasha Levin , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 186/266] mfd: stmfx: Reset chip on resume as supply was disabled Date: Wed, 17 Jun 2020 21:15:11 -0400 Message-Id: <20200618011631.604574-186-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amelie Delaunay [ Upstream commit e583649d87ec090444aa5347af0927cd6e8581ae ] STMFX supply is disabled during suspend. To avoid a too early access to the STMFX firmware on resume, reset the chip and wait for its firmware to be loaded. Fixes: 06252ade9156 ("mfd: Add ST Multi-Function eXpander (STMFX) core driver") Signed-off-by: Amelie Delaunay Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/stmfx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index 857991cb3cbb..fde6541e347c 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -501,6 +501,13 @@ static int stmfx_resume(struct device *dev) } } + /* Reset STMFX - supply has been stopped during suspend */ + ret = stmfx_chip_reset(stmfx); + if (ret) { + dev_err(stmfx->dev, "Failed to reset chip: %d\n", ret); + return ret; + } + ret = regmap_raw_write(stmfx->map, STMFX_REG_SYS_CTRL, &stmfx->bkp_sysctrl, sizeof(stmfx->bkp_sysctrl)); if (ret) -- 2.25.1