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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 921BEC43603 for ; Mon, 9 Dec 2019 11:33:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6718F207FF for ; Mon, 9 Dec 2019 11:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="MTQNLJGX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbfLILc5 (ORCPT ); Mon, 9 Dec 2019 06:32:57 -0500 Received: from mx0a-001ae601.pphosted.com ([67.231.149.25]:43666 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727300AbfLILc4 (ORCPT ); Mon, 9 Dec 2019 06:32:56 -0500 Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB9BUfjw015458; Mon, 9 Dec 2019 05:32:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=PODMain02222019; bh=x1yMu7o79Jw/xPDHt66WPliG8dBpE+NmweeSPNWuINM=; b=MTQNLJGX7a4mBM7lu7YyZdPH/bzBm6qaMe5Qpj/J2ndYwM0p28hTD7OerANjohYWuz95 80m7CMe+NvsCYJ5EYI5I5xvixb6md0uBsR802h75RWpPiLj14zXRKKgLYiHYeGlGVOLs pL7SvlYSKjg5/34EcY/3Fn4y9MJ2eXqU7xHxJyHB+JNlD1OgHIFnM9U0/QHSUuttJVtT jNvV7PeL8JDa+KQZZDfYrcevk6coTpy79n3XhR+LuCGYDNesYNMSohYBHuWR5kkHi7PJ L2ptWE3Fcwe5cGHPPkJIlyL27VcA3NsjfXDzTNdT2MXtI72COMXYMC3Kgy/5ZdEC37QM nQ== Authentication-Results: ppops.net; spf=fail smtp.mailfrom=ckeepax@opensource.cirrus.com Received: from ediex01.ad.cirrus.com ([5.172.152.52]) by mx0a-001ae601.pphosted.com with ESMTP id 2wrac6j1bw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 09 Dec 2019 05:32:53 -0600 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Mon, 9 Dec 2019 11:32:51 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.1591.10 via Frontend Transport; Mon, 9 Dec 2019 11:32:51 +0000 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 580862C8; Mon, 9 Dec 2019 11:32:51 +0000 (UTC) From: Charles Keepax To: , CC: , , Subject: [PATCH 2/2] regulator: arizona-ldo1: Improve handling of regulator unbinding Date: Mon, 9 Dec 2019 11:32:51 +0000 Message-ID: <20191209113251.18692-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191209113251.18692-1-ckeepax@opensource.cirrus.com> References: <20191209113251.18692-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-SPF-Result: fail X-Proofpoint-SPF-Record: v=spf1 include:spf-001ae601.pphosted.com include:spf.protection.outlook.com -all X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 mlxlogscore=598 spamscore=0 mlxscore=0 clxscore=1015 adultscore=0 impostorscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912090098 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current unbinding process for Madera has some issues. The trouble is runtime PM is disabled as the first step of the process, but some of the drivers release IRQs causing regmap IRQ to issue a runtime get which fails. To allow runtime PM to remain enabled during mfd_remove_devices, the DCVDD regulator must remain available. In the case of external DCVDD's this is simple, the regulator can simply be disabled/put after the call to mfd_remove_devices. However, in the case of an internally supplied DCVDD the regulator needs to be released after all the MFD children, except for the regulator child itself, have been removed. This is achieved by having the regulator driver itself do the disable/put, as it is the last driver removed from the MFD. Signed-off-by: Charles Keepax --- drivers/regulator/arizona-ldo1.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 1a3d7b720f5e0..83dd37dbfe07b 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -375,6 +375,18 @@ static int madera_ldo1_probe(struct platform_device *pdev) return 0; } +static int madera_ldo1_remove(struct platform_device *pdev) +{ + struct madera *madera = dev_get_drvdata(pdev->dev.parent); + + if (madera->internal_dcvdd) { + regulator_disable(madera->dcvdd); + regulator_put(madera->dcvdd); + } + + return arizona_ldo1_remove(pdev); +} + static struct platform_driver arizona_ldo1_driver = { .probe = arizona_ldo1_probe, .remove = arizona_ldo1_remove, @@ -385,7 +397,7 @@ static struct platform_driver arizona_ldo1_driver = { static struct platform_driver madera_ldo1_driver = { .probe = madera_ldo1_probe, - .remove = arizona_ldo1_remove, + .remove = madera_ldo1_remove, .driver = { .name = "madera-ldo1", }, -- 2.11.0