diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 10:35:33 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 10:35:33 +0100 |
| commit | 22164fbe274c2dd96d2887fe121896d321000a61 (patch) | |
| tree | 629a8af05ecbe3ed8e18938de2564517c9b44d92 /include/linux/reset-controller.h | |
| parent | 3d0dad869aeb5d8e81985c73a6c73428258f8083 (diff) | |
| parent | f5c547efa16c0ea5abff0596e829f502be11902e (diff) | |
Merge drm/drm-next into drm-misc-next
Requested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/reset-controller.h')
| -rw-r--r-- | include/linux/reset-controller.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h index 9326d671b6e6..ec35814e0bbb 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -7,7 +7,7 @@ struct reset_controller_dev; /** - * struct reset_control_ops + * struct reset_control_ops - reset controller driver callbacks * * @reset: for self-deasserting resets, does all necessary * things to reset the device @@ -33,7 +33,7 @@ struct of_phandle_args; * @provider: name of the reset controller device controlling this reset line * @index: ID of the reset controller in the reset controller device * @dev_id: name of the device associated with this reset line - * @con_id name of the reset line (can be NULL) + * @con_id: name of the reset line (can be NULL) */ struct reset_control_lookup { struct list_head list; @@ -62,7 +62,8 @@ struct reset_control_lookup { * @of_node: corresponding device tree node as phandle target * @of_reset_n_cells: number of cells in reset line specifiers * @of_xlate: translation function to translate from specifier as found in the - * device tree to id as given to the reset control ops + * device tree to id as given to the reset control ops, defaults + * to :c:func:`of_reset_simple_xlate`. * @nr_resets: number of reset controls in this reset controller device */ struct reset_controller_dev { |