Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp930488ybt; Wed, 17 Jun 2020 18:12:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxY+W8OJnD8qGUroVVmISb0SNWOywRGJSvQQAuWa3s7QswnsESOiZDKm0neTqXFJDdT7kT X-Received: by 2002:a17:906:470c:: with SMTP id y12mr1798928ejq.336.1592442754840; Wed, 17 Jun 2020 18:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442754; cv=none; d=google.com; s=arc-20160816; b=r8+fE8U70//o1OnJLwAlDhfcYbmi4cjpALugxjH6dbfNp1H2CUc/TeRwE384eI/7ZS z3oRcAcane3Bjfg/x0jucieq2LdO4KabjG3ngf97/QQIx4tktt5T93oWqaz6M3gvQMUj ohunelTYdejtuLofrMdBKFLGIVDT1CUXNBztw1x1vkHFfYHz7tRt+OcoY3oD0afnekAP 7GMCDDWOBd/o0LKXtIoKn2CGcKer5J5tyVhWJq1dXGe4zXkKwpcUKONKMiMYNAZXW/Xc 7OWGQead1WW05Zi/3pY6i/MqLjK1GJf7tbY0ffdSyz4/dDE7iLU8pea981rNRgnmIgnO 9f8g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=on3Y3aiIb8O4MFKLikAKq+HUaFIhQDd6i1CiQr/3S5I=; b=lkXpCSWK3QH84JBdTkhIaacbPDQf41XiP3NtaVJUEvdX5RgDFG2IKhM4rbzVHwO1po z4UhV+R9/hDcTM6yDBhulxTad4cdDQbZK5GVjh5pcpmrr9vwbbUz1EIUSH5B91cU0Nrq 2PXtqGIBjaPL9AJvYy+iOv+aNbAG5pxjlOMD8a9S5twNecKdv/Ujg0nzvEVxYE60xpQY BgKzVnp3t9+/L6ttsK8xKE9JH+vzqgkQIVdfKSclDwhmYKcroTDArSo1JA6qNFOgB5fv 3KkPwsPf8C/EJdd45H6QkG5Q+yocmzJHLhsmlLrtaQ8cP52yfxs1+SjGJ7GHSh2Pa3H/ nmXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Uy+/TZ0y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e1si965179eds.436.2020.06.17.18.12.12; Wed, 17 Jun 2020 18:12:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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="Uy+/TZ0y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728285AbgFRBJr (ORCPT + 99 others); Wed, 17 Jun 2020 21:09:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:36342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728254AbgFRBJl (ORCPT ); Wed, 17 Jun 2020 21:09:41 -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 BD79121D91; Thu, 18 Jun 2020 01:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442581; bh=EOEpLFrpL07cKV3jYLatlv8jhS7AwfBNhQfXh5nU21g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uy+/TZ0yloQvgMeKWzRgLRzrQCjri7sRH5kprHCOAqCbzQGMIv8s4H6Nul3MpHbve MbqVHs1oX1pVvwR8x3vXLZKfKCWlvNsH4tBK1d0oJ5zJkGX8PstWo54/dLVGFeY2DN 4F/HLaOTNHauH81idCkX3Ni2BCKmM4FxsiHyyQwQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marek Szyprowski , Charles Keepax , Lee Jones , Sasha Levin , patches@opensource.cirrus.com Subject: [PATCH AUTOSEL 5.7 073/388] mfd: wm8994: Fix driver operation if loaded as modules Date: Wed, 17 Jun 2020 21:02:50 -0400 Message-Id: <20200618010805.600873-73-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 1e9fe7d92597..737dede4a95c 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -690,3 +690,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