Commit a250cd4c authored by Andrew Davis's avatar Andrew Davis Committed by Stephen Boyd
Browse files

clk: keystone: syscon-clk: Do not use syscon helper to build regmap 



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: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250123181913.597304-1-afd@ti.com


Tested-by: default avatarNishanth Menon <nm@ti.com>
[sboyd@kernel.org: Drop dev_err_probe() because the mapping function
already does it]
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 2014c95a

drivers/clk/keystone/syscon-clk.c

+12 −1
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ static struct clk_hw 
	return &priv->hw;

}



static const struct regmap_config ti_syscon_regmap_cfg = {

	.reg_bits = 32,

	.val_bits = 32,

	.reg_stride = 4,

};



static int ti_syscon_gate_clk_probe(struct platform_device *pdev)

{

	const struct ti_syscon_gate_clk_data *data, *p;
@@ -113,12 +119,17 @@ static int ti_syscon_gate_clk_probe(struct platform_device *pdev) 
	int num_clks, num_parents, i;

	const char *parent_name;

	struct regmap *regmap;

	void __iomem *base;



	data = device_get_match_data(dev);

	if (!data)

		return -EINVAL;



	regmap = device_node_to_regmap(dev->of_node);

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);



	regmap = regmap_init_mmio(dev, base, &ti_syscon_regmap_cfg);

	if (IS_ERR(regmap))

		return dev_err_probe(dev, PTR_ERR(regmap),

				     "failed to get regmap\n");