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 218831E2834; Wed, 19 Mar 2025 14:35:22 +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=1742394922; cv=none; b=a3tZ/vvjJxMvEbE6NiRzhN4j2Y6fyKKNIRSyoiC2DxU3k7dKIAeHWO/8RKtvXMaxfU6TRqFB7rjnEIZpl9+4PcKIjQmofdNuxuic5Xv5O1St6QL30n2g2LRb+9Td43f/povXQjzHi6rZaeTbwLVJpPgOA04eXzPBGqGOJUrQI+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742394922; c=relaxed/simple; bh=AkZ/JD2pBiFSXEh4XKTFJWBFCOiWwM2pRjVe9qPywhg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iTtCZbW6qGZw2UMoGm3x00s27GiXLvMrfncozHchEHuQqdKz1VQGYQlAH4al2yYjD8lHM9A0EAMWTQl2uWUIEuMlh36zJcaEt8DQehV56ixGCSRXpwwdxOw8LmXuGK71KVjJKDQtgmdZ4rT4sbOr8YEyW9RE7oWVh8Pxn7kLbsU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w4pgBIGn; 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="w4pgBIGn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC4D8C4CEE4; Wed, 19 Mar 2025 14:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742394922; bh=AkZ/JD2pBiFSXEh4XKTFJWBFCOiWwM2pRjVe9qPywhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4pgBIGnqsDOl4C3X9I5IQsG7hWnzfe8Uy/ystZVHiGfQNgUsaxYE/SrKsi8xzdx1 qENAimSZOT/KDT7VNjq3aDU7l1UyYDe0Cl/bEoCiA4A1OkES5QbpJnNO9NvCW171PF E+qLAPZEUzrSLJ8fkPyB/S+DOnUkIqAVAakUE5og= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrew Davis , Nishanth Menon , Vinod Koul , Sasha Levin Subject: [PATCH 6.13 133/241] phy: ti: gmii-sel: Do not use syscon helper to build regmap Date: Wed, 19 Mar 2025 07:30:03 -0700 Message-ID: <20250319143031.019189063@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143027.685727358@linuxfoundation.org> References: <20250319143027.685727358@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.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Davis [ Upstream commit 5ab90f40121a9f6a9b368274cd92d0f435dc7cfa ] 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 Tested-by: Nishanth Menon Link: https://lore.kernel.org/r/20250123182234.597665-1-afd@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/ti/phy-gmii-sel.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/phy/ti/phy-gmii-sel.c b/drivers/phy/ti/phy-gmii-sel.c index e0ca59ae31531..ff5d5e29629fa 100644 --- a/drivers/phy/ti/phy-gmii-sel.c +++ b/drivers/phy/ti/phy-gmii-sel.c @@ -424,6 +424,12 @@ static int phy_gmii_sel_init_ports(struct phy_gmii_sel_priv *priv) return 0; } +static const struct regmap_config phy_gmii_sel_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + static int phy_gmii_sel_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -468,7 +474,14 @@ static int phy_gmii_sel_probe(struct platform_device *pdev) priv->regmap = syscon_node_to_regmap(node->parent); if (IS_ERR(priv->regmap)) { - priv->regmap = device_node_to_regmap(node); + void __iomem *base; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return dev_err_probe(dev, PTR_ERR(base), + "failed to get base memory resource\n"); + + priv->regmap = regmap_init_mmio(dev, base, &phy_gmii_sel_regmap_cfg); if (IS_ERR(priv->regmap)) return dev_err_probe(dev, PTR_ERR(priv->regmap), "Failed to get syscon\n"); -- 2.39.5