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,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 CAF8BC433E0 for ; Mon, 29 Jun 2020 20:34:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3ED5206C3 for ; Mon, 29 Jun 2020 20:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593462851; bh=q+7gY2SeD3b7kSkgWYgPz2xXtwzGx94EdwIhMcM5uik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T0OwghTb9K9/GQzflnxjXpXPzIpt5eG9DNEpQEURTK4wHe1pz3viYV/d420/Butix L59YMfXpkpwA/LGvkpthn/N9xpyHfv3NrVicJY/XlLgUKv3qlqV4FYNfVyRZLWp9tU ETXONHPOA460Wa52yZ3VVzPKNKZTwmfuhKZSILf8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389359AbgF2Udy (ORCPT ); Mon, 29 Jun 2020 16:33:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:37016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732148AbgF2TZQ (ORCPT ); Mon, 29 Jun 2020 15:25:16 -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 9D0BE2536A; Mon, 29 Jun 2020 15:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445231; bh=q+7gY2SeD3b7kSkgWYgPz2xXtwzGx94EdwIhMcM5uik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nck8cTMSleU48EsHuNK0M1NUUCHZ4FZIh9WhLRZQzbRlN6lS2eoswAtwS3LlFYLGK skLjoYGd6UcnQQLJczQDZq/ZWLWm0bYfbHafWaqtvbVqSSZH6kQcy+dGEE/Kf6KVei Stvr9Thn8g4PdruVDdnysr6GnhuK5LYbOFf3v1/Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marek Szyprowski , Charles Keepax , Lee Jones , Sasha Levin Subject: [PATCH 4.9 016/191] mfd: wm8994: Fix driver operation if loaded as modules Date: Mon, 29 Jun 2020 11:37:12 -0400 Message-Id: <20200629154007.2495120-17-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+00:00 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: 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 8588dbad33011..925c1828ec288 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -698,3 +698,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