From patchwork Tue Jun 23 19:55:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191585 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1355909ecs; Tue, 23 Jun 2020 14:06:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZ6ZqCsb7gr1FB7heJKB1y3baVP+QpachX55CtZQSYOMY+MG6e6WfIH+IAt5HFzDatxTDQ X-Received: by 2002:a05:6402:228a:: with SMTP id cw10mr22821483edb.147.1592946365291; Tue, 23 Jun 2020 14:06:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592946365; cv=none; d=google.com; s=arc-20160816; b=pyVx9bnY7eEIGT2PVzD4oSSNPCDSxtRWAu8AUdMDs3pRrALY1h3BKPFcAutMWOmyca vqJlmm/WhqojkeBKGuLDi9E+h/7ArnsLhVVAEBc3FeWCZteFebUJcTf3OTpagxSSofJH sEwyaXtx2YsL+9BntffEthIKR65FutaXDmEdwCXAfZ1Z5tt5E27Stc8qeFh6T0OozcCk b/EUH8Cm7F3P4XDntU+rqXv2xlluMAJ5sKaecCiV8gj6WNN+FHCC61/CyPyrXYKnKY3P oPq5+5US29mWJsi/5Pf3lKhgDTsppTQ01S5aQ/LqE6/PnwwvhmPA3VXUXRK5DUfyDeym AJ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dn6S4d9+XxLdYqmXF343RgLRIhINJ1b/cXJP7FmsBHI=; b=ExjfiJ/3yD0eed9PLpqmXphAE7DXQg46STXiXq1FAVpJFAT7Tl/UoGJ4GVfru4DJ91 VW6IsRiIBI6US5lJJKyS8/Bz1ScruHIuQ6cRDgVdK0jCBmqj7xqzFFQAv89HDDfruxdl ikLV3dSXwERntam/vsvlRSAopW1abkpn0SS7+uK+oDo3eKCgxd4+G3oIea4ZEd9qAhuw Yc1RVSVkly6hxdUHbLpzt1UFngQs5vzYla9gvLyT57lv758DdXvrzn6L3CkUiouLpPt/ B6lcwwChxTO/hSyR38rPATZ/5Lownw8SIg67XRoBLcN3+VeFOnSkMKYlrv4EhbtlULCw TDHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y29wscPC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gq19si9835829ejb.682.2020.06.23.14.06.05; Tue, 23 Jun 2020 14:06:05 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y29wscPC; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389496AbgFWVGD (ORCPT + 15 others); Tue, 23 Jun 2020 17:06:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:59490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391278AbgFWUgZ (ORCPT ); Tue, 23 Jun 2020 16:36:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 580BE20781; Tue, 23 Jun 2020 20:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944585; bh=JW5oZEcVIjKvNl5OWuJjJdw+UlXjXTk3oylQaUFQl1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y29wscPCn8jRZgGtLtkqpsy//+z1NKiZLMlG1Tyusu82A/hNdjUC/Ya/8NaC+UcHI YlIZR8SJaz/eZFGPnpFoFDdTm5K5wtYUAAB574TwASaDTuxvXdudlp9Ow20pfKsMeC etRuPaqztVuW+DJeQ+MpWzbiuns9meknYEq7g3Ak= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Charles Keepax , Lee Jones , Sasha Levin Subject: [PATCH 4.19 029/206] mfd: wm8994: Fix driver operation if loaded as modules Date: Tue, 23 Jun 2020 21:55:57 +0200 Message-Id: <20200623195318.411590800@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit d4f9b5428b53dd67f49ee8deed8d4366ed6b1933 ] WM8994 chip has built-in regulators, which might be used for chip operation. They are controlled by a separate wm8994-regulator driver, which should be loaded before this driver calls regulator_get(), because that driver also provides consumer-supply mapping for the them. If that driver is not yet loaded, regulator core substitute them with dummy regulator, what breaks chip operation, because the built-in regulators are never enabled. Fix this by annotating this driver with MODULE_SOFTDEP() "pre" dependency to "wm8994_regulator" module. Signed-off-by: Marek Szyprowski Acked-by: Charles Keepax Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/wm8994-core.c | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 22bd6525e09cf..933a50049d729 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -704,3 +704,4 @@ module_i2c_driver(wm8994_i2c_driver); MODULE_DESCRIPTION("Core support for the WM8994 audio CODEC"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Mark Brown "); +MODULE_SOFTDEP("pre: wm8994_regulator");