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 6F8A83AFA85; Mon, 5 May 2025 23:20:17 +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=1746487217; cv=none; b=sKBHiKe8WR6qvePHxTaT6NRPeYmXnnkyOjUZ4x9qq6S5FPyq/ckhQLbVsrFCj+8JOc9FMWQmFvMbiIOHlKQL2ddUnUpHZ8FylZXGATwD3ZS67HP0ShTaVh9UMDyjjryweozdK5CRQu+iJZ9yvuOV3/PaUawp/BjeamzCDkTKlo4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487217; c=relaxed/simple; bh=T7rxqXKs/IlxOsZcDkO0kdWR2/NNTe6ktqXrjmvDgxw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XXn3ShU4UwcterpK9OiRQPI/HZFGE29RmnF4zv14C1hik07SCcmh1lnWOXQ4Dmr/aioQ2tZ5t6DjY8pcNsoAXN2WywE16mJhEsCUdqqPKnNePaxsaCtN/YuCsvSGRoG+WcXsLU2PLt+OZlGpyEfbRYmD0l2ff9YnWMRe4Z46yz8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ms6jFVbO; 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="Ms6jFVbO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A3A0C4CEF1; Mon, 5 May 2025 23:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487217; bh=T7rxqXKs/IlxOsZcDkO0kdWR2/NNTe6ktqXrjmvDgxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ms6jFVbODqEdyOBBpeM+8leimCOhL3aGw0yANYXmJx4qjbu5mtkjlNjFTCa4Aim68 DsGJWyEr4NQURUWBv1hYr6Ocuhazubl5payCWrOdfwa8g/91Zbkq314KaAUaNe6S78 U0jVLtHyFwJllQlmZlt84sK7OlUEgSF6KJUdEnhg6E7s/f6i1iLo21TUKX2evQ/lU5 tDDWHktNznZ/a2CXBDaYSmSpYAlx0w1K9NDhAH8pNrSxhRAZycfPr8BhAvn1p7Mn8c SZPOLBTfKApsUQWzsXNrHxy0DWLhv2FUEoi7ACYaYOlqvXCKh7I88YBCfwxP/C+/eT Gxeo89Mdcgbvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrew Davis , Nishanth Menon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 063/114] soc: ti: k3-socinfo: Do not use syscon helper to build regmap Date: Mon, 5 May 2025 19:17:26 -0400 Message-Id: <20250505231817.2697367-63-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231817.2697367-1-sashal@kernel.org> References: <20250505231817.2697367-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.10.237 Content-Transfer-Encoding: 8bit From: Andrew Davis [ Upstream commit a5caf03188e44388e8c618dcbe5fffad1a249385 ] The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself. This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function. Signed-off-by: Andrew Davis Link: https://lore.kernel.org/r/20250123181726.597144-1-afd@ti.com Signed-off-by: Nishanth Menon Signed-off-by: Sasha Levin --- drivers/soc/ti/k3-socinfo.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c index bbbc2d2b70918..4d89481654872 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -57,6 +57,12 @@ k3_chipinfo_partno_to_names(unsigned int partno, return -EINVAL; } +static const struct regmap_config k3_chipinfo_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + static int k3_chipinfo_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; @@ -64,13 +70,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct soc_device *soc_dev; struct regmap *regmap; + void __iomem *base; u32 partno_id; u32 variant; u32 jtag_id; u32 mfg; int ret; - regmap = device_node_to_regmap(node); + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + regmap = regmap_init_mmio(dev, base, &k3_chipinfo_regmap_cfg); if (IS_ERR(regmap)) return PTR_ERR(regmap); -- 2.39.5