From patchwork Tue Jun 23 19:51:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191537 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2291513ile; Tue, 23 Jun 2020 13:05:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpZNG1q37FxkXC0rp5UQiV8iaM0Vw/zHB/k6WrVIsw+6tTmyZ+7kDfaRRJh3ln5NU8z/3Z X-Received: by 2002:a05:6402:2212:: with SMTP id cq18mr18578071edb.173.1592942711776; Tue, 23 Jun 2020 13:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942711; cv=none; d=google.com; s=arc-20160816; b=JsTNILw2pIu3VimlL1pN09rdZa5pNROvgBZx4SNgvjY5ebd5sm3vTmOsvLeWl9CYTb v/rznPgdTVfwqH6jccX4MuyfYq8TBmnRyBU8v2T07mWwSoR0Tg1/tTw3gCqBpbJPhxv/ egXKOcMrR2hWAgX1JjC05V4Gi2O61WgQ6lqaYcJUuSCjtZU/7K8vSvopI1Nut1rEurWV DWzLd+0yyrtvvLTjoOHbxhB1Mc9EwqspnIP2NwL4ZBhLnbJfnD49zyp2xyUF+6zbSEXu 1PxFuiuCI5gZa4dcuOgz6C93hVnk/aTNBuJGdZ6eEZGo+fAuAs2CCNZXynuZd4gWnjt3 +qWw== 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=IjWt9B0TaL3yFxhOJeAG6TVbhLgA5NlKQaL3XUpwiT8=; b=OWO+IXv93Eu6PpWYEFzEY2HFZzn4WSc8TcmVzS+x+UVnhMPq+jS+SRQCF/7vnJrCUO uZ72zS/PZr7qtwgx+kmlKFKuxucyxBXj54AX7gIdnhYin5SqguPKjiGUZyR+vLn7kCob 3ALIdSlPvvkIih+8KMI2lwwy0MLu0BxiBMbnpMXzB6qkqWAnQVEkFkTkdyTI5A2E5/kn T/BJXQPFnKxMxtPnhVzTpdEkaVPoJJeHqafJ5+bsrISZ4DU5FChVKcYgavzW4cSZPKWj AK/xmMvoq1PGXo5hZlTMcTiMgYJeESM2tQYJdBVBKMSKxJXBvgHNqrJ3XPKgPWuTVtKT /fgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yOiVCwOL; 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 nb1si3624535ejb.565.2020.06.23.13.05.11; Tue, 23 Jun 2020 13:05:11 -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=yOiVCwOL; 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 S2388317AbgFWUFK (ORCPT + 15 others); Tue, 23 Jun 2020 16:05:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387744AbgFWUFG (ORCPT ); Tue, 23 Jun 2020 16:05:06 -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 DC71C2078A; Tue, 23 Jun 2020 20:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942706; bh=mNioKdiZlltvXFckGUJKJRkoWeOJS4WqiAurf6blrSA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yOiVCwOLWqK0nd1EZuQNGpIt35FXowvAnrmJYdCmzqe0C6CF+uJr5fk+i/WSO6qlb UoIPgyd9YlcX2bhXOqvm+/A9Js+9M7tDWmILV0f8iQPyLaGKgGH+dHUDcGOrwcdxk5 X0j6s7sFvrHtgPhV8c+mK9ftrE+wDUAQiSW3zIPw= 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 5.7 072/477] mfd: wm8994: Fix driver operation if loaded as modules Date: Tue, 23 Jun 2020 21:51:09 +0200 Message-Id: <20200623195411.021873892@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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 1e9fe7d92597e..737dede4a95c3 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");