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=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 2F49AC433E1 for ; Tue, 23 Jun 2020 21:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0102520663 for ; Tue, 23 Jun 2020 21:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592946365; bh=JW5oZEcVIjKvNl5OWuJjJdw+UlXjXTk3oylQaUFQl1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XnTdOk8jmSP1NKfOQaxRHFhBCBEttOe45JlS/SvkVUz3qpu+y+ywbDIeB1x2V+rTB 6grn7JJzA3VZcREvz89BIoIKaiL0Q4odObQarMNoStIQE6dZfp5A9YHHPteiPeXa2m XItyAgt5komfc8Wi5tNmfvagKHaFEYNL1Thdo2qw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389496AbgFWVGD (ORCPT ); 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 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 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"); -- 2.25.1