Merge tag 'reset-for-3.19-2' of git://git.pengutronix.de/git/pza/linux into next/drivers

STMicroelectronics STi family Sysconfig Picophy SoftReset Controller

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

This binding describes a reset controller device that is used to enable and

disable on-chip PicoPHY USB2 phy(s) using "softreset" control bits found in

the STi family SoC system configuration registers.

The actual action taken when softreset is asserted is hardware dependent.

However, when asserted it may not be possible to access the hardware's

registers and after an assert/deassert sequence the hardware's previous state

may no longer be valid.

Please refer to Documentation/devicetree/bindings/reset/reset.txt

for common reset controller binding usage.

Required properties:

- compatible: Should be "st,stih407-picophyreset"

- #reset-cells: 1, see below

Example:

	picophyreset: picophyreset-controller {

		compatible = "st,stih407-picophyreset";

		#reset-cells = <1>;

	};

Specifying picophyreset control of devices

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

Device nodes should specify the reset channel required in their "resets"

property, containing a phandle to the picophyreset device node and an

index specifying which channel to use, as described in

Documentation/devicetree/bindings/reset/reset.txt.

Example:

	usb2_picophy0: usbpicophy@0 {

		resets = <&picophyreset STIH407_PICOPHY0_RESET>;

	};

Macro definitions for the supported reset channels can be found in:

include/dt-bindings/reset-controller/stih407-resets.h

}

EXPORT_SYMBOL_GPL(reset_control_deassert);

/**

 * reset_control_status - returns a negative errno if not supported, a

 * positive value if the reset line is asserted, or zero if the reset

 * line is not asserted.

 * @rstc: reset controller

 */

int reset_control_status(struct reset_control *rstc)

{

	if (rstc->rcdev->ops->status)

		return rstc->rcdev->ops->status(rstc->rcdev, rstc->id);

	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(reset_control_status);

/**

 * of_reset_control_get - Lookup and obtain a reference to a reset controller.

 * @node: device to be reset by the controller

	return 0;

}

static int socfpga_reset_status(struct reset_controller_dev *rcdev,

				unsigned long id)

{

	struct socfpga_reset_data *data = container_of(rcdev,

						struct socfpga_reset_data, rcdev);

	int bank = id / BITS_PER_LONG;

	int offset = id % BITS_PER_LONG;

	u32 reg;

	reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));

	return !(reg & BIT(offset));

}

static struct reset_control_ops socfpga_reset_ops = {

	.assert		= socfpga_reset_assert,

	.deassert	= socfpga_reset_deassert,

	.status		= socfpga_reset_status,

};

static int socfpga_reset_probe(struct platform_device *pdev)

	bool

	select STI_RESET_SYSCFG

config STIH407_RESET

	bool

	select STI_RESET_SYSCFG

endif

obj-$(CONFIG_STIH415_RESET) += reset-stih415.o

obj-$(CONFIG_STIH416_RESET) += reset-stih416.o

obj-$(CONFIG_STIH407_RESET) += reset-stih407.o