From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1873A3C1997; Mon, 5 May 2025 23:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487447; cv=none; b=W0q68E5DMmfJ/H8REasKkr4nmZKJUyMXZVbtNIQMENi6zWJiWLIfde3IB1ZUy4bD7+ulc7Uftk48V4jocrDJPAblaVU9KQePv/+Wi+m5gXIyzXKFia+y3kBh6icfnLgKCMCAOmeVqflndRXj1wZxAm4jIBPnDEFLlFqBNAchuU4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487447; c=relaxed/simple; bh=zERVQQNvuOQinF99ex3FLAIPNtpSUKafbHMHhaIZqb0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fi9PhoI9ua/vwXDL23wUV+jz18fu+i2mGi7/xWtergX+tIHCa84SFnneHueGm69GopbufptsEs8R1FAdy8lAI2yMrpk6Ldc30+vYxeQW5QZNWU1HDSVhNNkDzqvk7kls7IYJFScS3lKOkFGk887sf1dJ/tDsnE03Y1GEc+z9zBg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d2GEJX68; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d2GEJX68" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18462C4CEEE; Mon, 5 May 2025 23:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487445; bh=zERVQQNvuOQinF99ex3FLAIPNtpSUKafbHMHhaIZqb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d2GEJX68x0NtHze3U/xreEyB+ayTf6BaNeKTMsh4VI7NKYMT6DzoOaL9M/lDJy/Nh TGnNG6/RvKFWGpZ7JzdUuMbm7HxN0jPzmovssIN8bT5zVioByfAcPnzpED5vkO6y8t 9WHodEmrkpt3LjqG21EZnxKUmkq5lJD34csWyhAYf/sZI6pEtMtqkO8n0mbKOGg5LF 1CGZVZS6wIeRWslBWcl3CVUrgucSt+nsKmNu8mQQjmT9fthN/5PdeYtRMQ0pcGcgE8 N19VopXM8nXuOAUeQhzoxbD/k/HQmhUtksVKJeEiv8L5kRcveRiyW4o1CP+swIMdhP 7kIsGJsv6I5qQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Isaac Scott , Michael Hennerich , Mark Brown , Sasha Levin , lgirdwood@gmail.com Subject: [PATCH AUTOSEL 5.4 77/79] regulator: ad5398: Add device tree support Date: Mon, 5 May 2025 19:21:49 -0400 Message-Id: <20250505232151.2698893-77-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505232151.2698893-1-sashal@kernel.org> References: <20250505232151.2698893-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.293 Content-Transfer-Encoding: 8bit From: Isaac Scott [ Upstream commit 5a6a461079decea452fdcae955bccecf92e07e97 ] Previously, the ad5398 driver used only platform_data, which is deprecated in favour of device tree. This caused the AD5398 to fail to probe as it could not load its init_data. If the AD5398 has a device tree node, pull the init_data from there using of_get_regulator_init_data. Signed-off-by: Isaac Scott Acked-by: Michael Hennerich Link: https://patch.msgid.link/20250128173143.959600-4-isaac.scott@ideasonboard.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/ad5398.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index 75f432f61e919..f4d6e62bd963e 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c @@ -14,6 +14,7 @@ #include #include #include +#include #define AD5398_CURRENT_EN_MASK 0x8000 @@ -221,15 +222,20 @@ static int ad5398_probe(struct i2c_client *client, const struct ad5398_current_data_format *df = (struct ad5398_current_data_format *)id->driver_data; - if (!init_data) - return -EINVAL; - chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; config.dev = &client->dev; + if (client->dev.of_node) + init_data = of_get_regulator_init_data(&client->dev, + client->dev.of_node, + &ad5398_reg); + if (!init_data) + return -EINVAL; + config.init_data = init_data; + config.of_node = client->dev.of_node; config.driver_data = chip; chip->client = client; -- 2.39.5