Merge branch 'sunxi/drivers-for-3.16' of https://github.com/mripard/linux into next/drivers

Allwinner sunxi Peripheral Reset Controller

===========================================

Please also refer to reset.txt in this directory for common reset

controller binding usage.

Required properties:

- compatible: Should be one of the following:

  "allwinner,sun6i-a31-ahb1-reset"

  "allwinner,sun6i-a31-clock-reset"

- reg: should be register base and length as documented in the

  datasheet

- #reset-cells: 1, see below

example:

ahb1_rst: reset@01c202c0 {

	#reset-cells = <1>;

	compatible = "allwinner,sun6i-a31-ahb1-reset";

	reg = <0x01c202c0 0xc>;

};

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)

	struct sunxi_reset_data *data = platform_get_drvdata(pdev);

	reset_controller_unregister(&data->rcdev);

	iounmap(data->membase);

	kfree(data);

	return 0;

}