From patchwork Mon Oct 25 10:53:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 12581419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60432C433FE for ; Mon, 25 Oct 2021 10:56:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 190D660241 for ; Mon, 25 Oct 2021 10:56:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 190D660241 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=alistair23.me Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=i/Dq+HLg9ES+8eLsoICiu0iNzAJE+u/HkJYHTCG8ywk=; b=EsCcYf+h2eW3y3 axv0DnSXjuKJ2cDR1AFZwW8nuKLDNl6lY9zSjsuhh8lgUM16OECFdENNwkZ3x+lsUU045O/IY6u2/ 7N4cti2ULp/kWKIAR0GIvcZAixlWYO0HkHzfXO8WapY2oJrbrnvhqdjFKQ5AmfgX5JwrxQBxsVv8s EEN7BjcWU9+k583zNgcwbLI8ME0jxbI5UTbIHRjJfmKkGiMeQT96u7Sd7ho5b5RM+kFooRhXNLuw3 O36PX5MkZQGNhXwFTAxeGMwXaNkfVIwrt4xg/syAX9KDy+cTmw4nN4f9o+dMv/UaXa4TurQKia9Vr yVuuvuRv4at39OeOcIsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mexdL-00G90K-KF; Mon, 25 Oct 2021 10:55:16 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mexcB-00G8Wi-JL for linux-arm-kernel@lists.infradead.org; Mon, 25 Oct 2021 10:54:05 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id D693F58045A; Mon, 25 Oct 2021 06:54:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 25 Oct 2021 06:54:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=qE6SMYoRQzVad KkaxPJOujbvaC++jF3gyfOey8v1upo=; b=Hoev4zvS9ET4XlsAfsLElP3S1h8/A pnK2HRnC0V7y60HoURLkek+NIkyjiCgyqLQPvrnCYevEzDn5bag2IiGsGtaCBFIO FUVDBWt1bvVTgSXOPSo37mFJ/MxbIGnbdSwkeAnjlb83R1QAj2H0nCAa4l+Nc4xF 7rQ92ugfNkePmnDi5eK5MisMhTaCh2c/0FTV5kGY96x+g+N7I8j2s8zkni8wX4EH Goq5+PezE2j24hoBXTT10DA1hULEA4BaNBxGj/DDq+H0RZrgqAk64+WycyvAVyAh kS2dPbwRgZdCHCvHqP1VAnABz6M1GGuMgXZtj3lDRTude8YtyUxoQ7xvQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=qE6SMYoRQzVadKkaxPJOujbvaC++jF3gyfOey8v1upo=; b=kYznf7/6 TY/wCgYmnnRYUE417/4eqa6irsHlBEka7VUGHAaoU2fcpkeotmx25dQi84qQw+/6 JPKKtJVt1v5x1REhN4+19o3tG+cV2AX4iu/OMtqpseXilCQJuKlJtmcBj5rWkFiX ByIPXJ43nExftd/437UarJfNZmHoyuhv/7sM2RoNp/0rM/mnTGVYusIy5zpwJPgY 7yQrbU/b4hQ2tcRa06rX0Gv+sNa9vpExzyeUHfol3iyhLrKPDiDZxac8+WL8TWby QyyX/zc8BaklQxyjoowV64eGF9t4yt9o9p5O5+K8Sla1uKD+m+IUL75SbYtceBKZ bB2WfQbIoR5SiA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvdefhedgfedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlihhsthgrihhrucfhrhgrnhgtihhsuceorghlihhsthgr ihhrsegrlhhishhtrghirhdvfedrmhgvqeenucggtffrrghtthgvrhhnpeeggedtteejke eggeeugfehueevudegvdetjeeviedugedvtdekffekhedtteduhfenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrlhhishhtrghirhesrghlih hsthgrihhrvdefrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 25 Oct 2021 06:53:54 -0400 (EDT) From: Alistair Francis To: robh+dt@kernel.org, kernel@pengutronix.de, lgirdwood@gmail.com, lee.jones@linaro.org, broonie@kernel.org Cc: s.hauer@pengutronix.de, rui.zhang@intel.com, linux-hwmon@vger.kernel.org, linux-arm-kernel@lists.infradead.org, amitk@kernel.org, shawnguo@kernel.org, alistair23@gmail.com, devicetree@vger.kernel.org, linux-imx@nxp.com, andreas@kemnade.info, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Alistair Francis Subject: [PATCH v14 4/8] regulator: sy7636a: Remove requirement on sy7636a mfd Date: Mon, 25 Oct 2021 20:53:05 +1000 Message-Id: <20211025105309.37942-5-alistair@alistair23.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211025105309.37942-1-alistair@alistair23.me> References: <20211025105309.37942-1-alistair@alistair23.me> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211025_035403_747580_15645ECC X-CRM114-Status: GOOD ( 11.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Signed-off-by: Alistair Francis --- drivers/regulator/Kconfig | 1 - drivers/regulator/sy7636a-regulator.c | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 4fd13b06231f..21077cb14625 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1199,7 +1199,6 @@ config REGULATOR_STW481X_VMMC config REGULATOR_SY7636A tristate "Silergy SY7636A voltage regulator" - depends on MFD_SY7636A help This driver supports Silergy SY3686A voltage regulator. diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c index 8360b3947ead..29fc27c2cda0 100644 --- a/drivers/regulator/sy7636a-regulator.c +++ b/drivers/regulator/sy7636a-regulator.c @@ -7,11 +7,14 @@ // Authors: Lars Ivar Miljeteig // Alistair Francis +#include +#include +#include #include #include +#include +#include #include -#include -#include struct sy7636a_data { struct regmap *regmap; @@ -70,7 +73,7 @@ static const struct regulator_desc desc = { static int sy7636a_regulator_probe(struct platform_device *pdev) { - struct regmap *regmap = dev_get_drvdata(pdev->dev.parent); + struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL); struct regulator_config config = { }; struct regulator_dev *rdev; struct gpio_desc *gdp;