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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 26D65C433DF for ; Tue, 23 Jun 2020 20:55:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00BB320656 for ; Tue, 23 Jun 2020 20:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945753; bh=3niqpMpn6w6Tkik35jaFf85x2SzD06y8my2fvQh26ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xfrZmSxcPkc1/76gWheZ7Qak2nLzizLoUBtXi4B/Jg+B+w1pMXpU+33Imm1oqxMnp yinR+c7bfH7N8nJCJ+48EuqbBwDYD9gtFZMv2nm/REmM45oXLtfgsUgwECoRf7xaDU xE0iTxwwA1eVyMs7arH2K7fgIIyv0cSyXju9509s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392575AbgFWUoY (ORCPT ); Tue, 23 Jun 2020 16:44:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:41504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392574AbgFWUoW (ORCPT ); Tue, 23 Jun 2020 16:44:22 -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 17B3C21D6C; Tue, 23 Jun 2020 20:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945062; bh=3niqpMpn6w6Tkik35jaFf85x2SzD06y8my2fvQh26ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mj7MBIuk91Z6MA4dXL4t0HTBhVhl6V6ALsPMweYYea29ia/LdF8qtIjYdA/eTmiJn /7bO5/7TPw9i49xlYeb+We4uLrNMr2uJVKP9rK/bX/naMV/k/U5IHcHUxj0am+sHTt tuI1SHvFPvwd4bWVziysAqlSImfKYpd4OwxrgOzE= 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.14 024/136] mfd: wm8994: Fix driver operation if loaded as modules Date: Tue, 23 Jun 2020 21:58:00 +0200 Message-Id: <20200623195304.851696307@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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(+) diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 953d0790ffd56..3259fb82d3c46 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -696,3 +696,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"); -- 2.25.1