Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfff6296 authored by Antoine Tenart's avatar Antoine Tenart Committed by Sebastian Hesselbarth
Browse files

reset: berlin: drop arch_initcall initialization 



With proper platform driver probing for berlin reset driver, drop the
arch_initcall workaround.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
parent 43225728

drivers/reset/reset-berlin.c

+1 −70
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
	container_of((p), struct berlin_reset_priv, rcdev)



struct berlin_reset_priv {

	void __iomem			*base;

	unsigned int			size;

	struct regmap			*regmap;

	struct reset_controller_dev	rcdev;

};
@@ -40,10 +38,7 @@ static int berlin_reset_reset(struct reset_controller_dev *rcdev, 
	int offset = id >> 8;

	int mask = BIT(id & 0x1f);



	if (priv->regmap)

	regmap_write(priv->regmap, offset, mask);

	else

		writel(mask, priv->base + offset);



	/* let the reset be effective */

	udelay(10);
@@ -58,7 +53,6 @@ static struct reset_control_ops berlin_reset_ops = { 
static int berlin_reset_xlate(struct reset_controller_dev *rcdev,

			      const struct of_phandle_args *reset_spec)

{

	struct berlin_reset_priv *priv = to_berlin_reset_priv(rcdev);

	unsigned offset, bit;



	if (WARN_ON(reset_spec->args_count != rcdev->of_reset_n_cells))
@@ -67,9 +61,6 @@ static int berlin_reset_xlate(struct reset_controller_dev *rcdev, 
	offset = reset_spec->args[0];

	bit = reset_spec->args[1];



	if (offset >= priv->size)

		return -EINVAL;



	if (bit >= BERLIN_MAX_RESETS)

		return -EINVAL;
@@ -120,63 +111,3 @@ MODULE_AUTHOR("Antoine Tenart <antoine.tenart@free-electrons.com>"); 
MODULE_AUTHOR("Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>");

MODULE_DESCRIPTION("Marvell Berlin reset driver");

MODULE_LICENSE("GPL");
 


static int __berlin_reset_init(struct device_node *np)

{

	struct berlin_reset_priv *priv;

	struct resource res;

	resource_size_t size;

	int ret;



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	ret = of_address_to_resource(np, 0, &res);

	if (ret)

		goto err;



	size = resource_size(&res);

	priv->base = ioremap(res.start, size);

	if (!priv->base) {

		ret = -ENOMEM;

		goto err;

	}

	priv->size = size;



	priv->rcdev.owner = THIS_MODULE;

	priv->rcdev.ops = &berlin_reset_ops;

	priv->rcdev.of_node = np;

	priv->rcdev.of_reset_n_cells = 2;

	priv->rcdev.of_xlate = berlin_reset_xlate;



	reset_controller_register(&priv->rcdev);



	return 0;



err:

	kfree(priv);

	return ret;

}



static const struct of_device_id berlin_reset_of_match[] __initconst = {

	{ .compatible = "marvell,berlin2-chip-ctrl" },

	{ .compatible = "marvell,berlin2cd-chip-ctrl" },

	{ .compatible = "marvell,berlin2q-chip-ctrl" },

	{ },

};



static int __init berlin_reset_init(void)

{

	struct device_node *np;

	int ret;



	for_each_matching_node(np, berlin_reset_of_match) {

		ret = __berlin_reset_init(np);

		if (ret)

			return ret;

	}



	return 0;

}

arch_initcall(berlin_reset_init);