diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 23:42:56 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 23:42:56 +0200 |
| commit | ed99885ccb89471f52d34b74b15fc9059bf07504 (patch) | |
| tree | f032dab24235b27e2f75c0046c445f23e5329d79 /drivers | |
| parent | Merge tag 'mvebu-drivers-3.16' of git://git.infradead.org/linux-mvebu into ne... (diff) | |
| parent | reset: sunxi: allow MFD subdevices probe (diff) | |
| download | linux-ed99885ccb89471f52d34b74b15fc9059bf07504.tar.xz linux-ed99885ccb89471f52d34b74b15fc9059bf07504.zip | |
Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next/drivers
Merge "Allwinner drivers changes for 3.16" from Maxime Ripard:
Reset drivers for the A31, that have been merged with reset maintainer's
Acked-by.
* 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux:
reset: sunxi: allow MFD subdevices probe
reset: sunxi: document sunxi's reset controllers bindings
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/reset/reset-sunxi.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index 695bd3496eba..a94e7a7820b4 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -145,7 +145,24 @@ MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids); static int sunxi_reset_probe(struct platform_device *pdev) { - return sunxi_reset_init(pdev->dev.of_node); + struct sunxi_reset_data *data; + struct resource *res; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + data->membase = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(data->membase)) + return PTR_ERR(data->membase); + + data->rcdev.owner = THIS_MODULE; + data->rcdev.nr_resets = resource_size(res) * 32; + data->rcdev.ops = &sunxi_reset_ops; + data->rcdev.of_node = pdev->dev.of_node; + + return reset_controller_register(&data->rcdev); } static int sunxi_reset_remove(struct platform_device *pdev) @@ -153,8 +170,6 @@ static int sunxi_reset_remove(struct platform_device *pdev) struct sunxi_reset_data *data = platform_get_drvdata(pdev); reset_controller_unregister(&data->rcdev); - iounmap(data->membase); - kfree(data); return 0; } |