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 99C6178F32; Tue, 27 May 2025 17:00:47 +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=1748365247; cv=none; b=oDQiFtUHy6GWck5jtipEbn6JaGADNFtwdc10OSh6sY4dtFyWTQ5g+A9NOEA2vEULldCEEja+JHZYwufEnyJi0gmmsX7kWBmBaB5xMW50VnRQqS/3yN7Sz0IavBaBkBa1Vqkx3HRUsP0dQCKtdFZjIGQtAa9MlojyVDzvaApNrHk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365247; c=relaxed/simple; bh=dsaNLLgWXZBlljSIknfyqh3MeYelMD1zfKUc0VPaqJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o7r56VyXFEm53L8nCT7PqlNYeEtZyTNBv0SEnRk1n8rYIIuhUeYyoXOzrTissk5O7D8Ov3dSvtljybAUhnBHPJrCj6AcHE2RRvN/0Zf8nfRq0D7iZh4aFH4yagPsTxtFU7wxqjQN/B1ak387s1wMzWxGFAB5fz8WjpG4nBv5cfk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t1YntJCH; 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="t1YntJCH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EED7C4CEE9; Tue, 27 May 2025 17:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365247; bh=dsaNLLgWXZBlljSIknfyqh3MeYelMD1zfKUc0VPaqJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t1YntJCHurUE96QlIdld1uaTmcje5+Zym9RexqhBMaFEhCymLi0bfa2YRBHliKHCK l4XOCdJL2lj06o0LhBa4kvsUnbXeWM/AkIdA03t3glzbp+dulynYY56uVu3AQBsLa3 ar1xgl3AJQHjChn3Jd+nMvR3D8MtKEfnOnzC63I4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrew Davis , Nishanth Menon , Sasha Levin Subject: [PATCH 6.12 283/626] soc: ti: k3-socinfo: Do not use syscon helper to build regmap Date: Tue, 27 May 2025 18:22:56 +0200 Message-ID: <20250527162456.532226727@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ 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 4fb0f0a248288..704039eb3c078 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -105,6 +105,12 @@ k3_chipinfo_variant_to_sr(unsigned int partno, unsigned int variant, return -ENODEV; } +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; @@ -112,13 +118,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