From patchwork Tue Jun 23 19:58:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191578 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1349179ecs; Tue, 23 Jun 2020 13:55:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGYVH1/FeztXJ1oqlB1EGVLSnsu8dJGDxRGegmjPUDiLIMmnMErlRUzXqFwVz3gJAnXWg1 X-Received: by 2002:a17:906:4a0c:: with SMTP id w12mr640337eju.106.1592945753165; Tue, 23 Jun 2020 13:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592945753; cv=none; d=google.com; s=arc-20160816; b=yWP9DfAGn9aWrlUTx6hPtI5Kn5ZiC35NakFoLSSuI+KEwrYnheb+kgTJ2Z4Tp++jPj VDYwBw8Vf1FG53TVMOQtePhLd3SDu1+CNS5AryVwHkSu+GNE7EKU3Fnbv27zGm4u4+n4 x8IwqtuC5coKB0sB2t56ITLYI85dsEEfVV064g2ffinyCkSPFeiHvD+aBA8Kbke+aahW RewFVxJ+StjbQPjiIvLrq8H09Xr/uYh3fCgJk053gxA42PjXI2qlvuKt9xyr8RyKIlYt ZpIE/3FjkuDmb5reBuJ9DP8BtLky46SA3EhQgJmXE7fTaabcbj6WbwwH5wPnQvvqqcVQ nGJQ== 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=LqrpEcdb0/R6WFs0Vh5ZLiR4mU2Usk/r2J85z3yWuxU=; b=ewE117aYipZz2XRCRc47YBi2t9jfu4Oa/To/anHhDBL2AxxvqrdzAa6CeAiXd+Y1M8 gEWyAEfCKL2LiX+gmpgEjdPaxf+KTawfET6zTWqK7lFL52O16tiuEIokWDJbPDcr29we XJtPI76rhbvCecfBZJ0RXU9RWpwaxWAYUehVdcwTpPwT6uh6XLgUkA8yXph73yv4Sfmb uyl2tBN1rUMBeTxgx+8kuNxpV7kaqui4ZBqSuNtH6eiaY6lKeKE08AJcT2pYlvcxQvu5 14MdF88Hz98fpG8kjwxqAsySJzorTnNlY/XbUEfyVRaR/LNdYKLSocddkWegPYab6KB/ AYdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Mj7MBIuk; 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 b17si11677022ejb.626.2020.06.23.13.55.52; Tue, 23 Jun 2020 13:55:53 -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=Mj7MBIuk; 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 S2392575AbgFWUoY (ORCPT + 15 others); 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 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 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");