From aed6f3cadc860ddeec598ed82041c1f3773071b1 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Sat, 16 May 2015 00:41:25 +0200 Subject: reset: berlin: convert to a platform driver The Berlin reset controller was introduced without being a platform driver because of a needed DT rework: the node describing the reset controller also describes the pinctrl and clk controllers... Prepare conversion by adding a platform driver probe to a new compatible "marvell,berlin2-reset" with syscon regmap. Signed-off-by: Antoine Tenart Acked-by: Philipp Zabel Signed-off-by: Sebastian Hesselbarth --- drivers/reset/reset-berlin.c | 53 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'drivers/reset/reset-berlin.c') diff --git a/drivers/reset/reset-berlin.c b/drivers/reset/reset-berlin.c index f8b48a13cf0b..d43bc163dd02 100644 --- a/drivers/reset/reset-berlin.c +++ b/drivers/reset/reset-berlin.c @@ -11,10 +11,12 @@ #include #include +#include #include #include #include #include +#include #include #include #include @@ -27,6 +29,7 @@ struct berlin_reset_priv { void __iomem *base; unsigned int size; + struct regmap *regmap; struct reset_controller_dev rcdev; }; @@ -37,7 +40,10 @@ static int berlin_reset_reset(struct reset_controller_dev *rcdev, int offset = id >> 8; int mask = BIT(id & 0x1f); - writel(mask, priv->base + offset); + if (priv->regmap) + regmap_write(priv->regmap, offset, mask); + else + writel(mask, priv->base + offset); /* let the reset be effective */ udelay(10); @@ -70,6 +76,51 @@ static int berlin_reset_xlate(struct reset_controller_dev *rcdev, return (offset << 8) | bit; } +static int berlin2_reset_probe(struct platform_device *pdev) +{ + struct device_node *parent_np = of_get_parent(pdev->dev.of_node); + struct berlin_reset_priv *priv; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->regmap = syscon_node_to_regmap(parent_np); + of_node_put(parent_np); + if (IS_ERR(priv->regmap)) + return PTR_ERR(priv->regmap); + + priv->rcdev.owner = THIS_MODULE; + priv->rcdev.ops = &berlin_reset_ops; + priv->rcdev.of_node = pdev->dev.of_node; + priv->rcdev.of_reset_n_cells = 2; + priv->rcdev.of_xlate = berlin_reset_xlate; + + reset_controller_register(&priv->rcdev); + + return 0; +} + +static const struct of_device_id berlin_reset_dt_match[] = { + { .compatible = "marvell,berlin2-reset" }, + { }, +}; +MODULE_DEVICE_TABLE(of, berlin_reset_dt_match); + +static struct platform_driver berlin_reset_driver = { + .probe = berlin2_reset_probe, + .driver = { + .name = "berlin2-reset", + .of_match_table = berlin_reset_dt_match, + }, +}; +module_platform_driver(berlin_reset_driver); + +MODULE_AUTHOR("Antoine Tenart "); +MODULE_AUTHOR("Sebastian Hesselbarth "); +MODULE_DESCRIPTION("Marvell Berlin reset driver"); +MODULE_LICENSE("GPL"); + static int __berlin_reset_init(struct device_node *np) { struct berlin_reset_priv *priv; -- cgit v1.2.3 From bfff6296180c56ccaf4ac36808440f8849aad7c1 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Sat, 16 May 2015 00:53:44 +0200 Subject: reset: berlin: drop arch_initcall initialization With proper platform driver probing for berlin reset driver, drop the arch_initcall workaround. Signed-off-by: Antoine Tenart Acked-by: Philipp Zabel Signed-off-by: Sebastian Hesselbarth --- drivers/reset/reset-berlin.c | 71 +------------------------------------------- 1 file changed, 1 insertion(+), 70 deletions(-) (limited to 'drivers/reset/reset-berlin.c') diff --git a/drivers/reset/reset-berlin.c b/drivers/reset/reset-berlin.c index d43bc163dd02..3c922d37255c 100644 --- a/drivers/reset/reset-berlin.c +++ b/drivers/reset/reset-berlin.c @@ -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); + regmap_write(priv->regmap, offset, mask); /* 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 "); MODULE_AUTHOR("Sebastian Hesselbarth "); 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); -- cgit v1.2.3