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 74A091F4165; Mon, 2 Jun 2025 15:13:58 +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=1748877239; cv=none; b=Rl2Bm1m+YcT3K0bRqULCVaglPjNBnxtO1Oa6zLMxILJ3a+mM1t6pV2Aa+5X516CnbsGAuG2r8+pVVJOv9HbzJzDtsc88VnCIIyUNj5YsJLnzzbn5DBBXWJs2Jvc1Tb+hS3jwQm0xotPPqSBKVjggfleHwvl/qMGI87cVy9NehSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877239; c=relaxed/simple; bh=UyWSct317ej7f2p+vbVviyvUPnIgEPHSOsaMySjdNjU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CIg0htWkAxln1Jl8OnEsuuOagtiSjnjf4iUfYkoxVxaNYvxGS6w0BJOCx5OkkBYP9cH6SFIyLKX65ZbHDRN0i1ruESLjRoqGizYxhiUSyAKbAUDg/0lSUtpUIyu1hmqs2Unz42vSIaYoNyrw3amH9Mz2RRo/QW1OMND54rKSATg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=R5WSdQkZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="R5WSdQkZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78F93C4CEEB; Mon, 2 Jun 2025 15:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748877238; bh=UyWSct317ej7f2p+vbVviyvUPnIgEPHSOsaMySjdNjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R5WSdQkZ2qbGNEwCd31VOn+v5RqMGLuGZk9kwqIXM/c/U/6bLEoxrz6PG2pqoW1US YLYcj3GC+MGM7e7PaFvZAL0ucRWFlsbhX8QmEieY3XwUJIng4BY1ENJSpB79wpeHKl CPptqpND63Sbb2rl7hA6b/2lNJXNTQ6HU0rBLhfk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Isaac Scott , Michael Hennerich , Mark Brown , Sasha Levin Subject: [PATCH 6.1 215/325] regulator: ad5398: Add device tree support Date: Mon, 2 Jun 2025 15:48:11 +0200 Message-ID: <20250602134328.533079864@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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