diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-04-06 22:36:50 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-04-06 22:36:50 +0200 |
| commit | ac8e5cc73736fe1ec6c7f3674ee71f7c99c42ae0 (patch) | |
| tree | e854a9878470a883cd678d4ee6f1b1d598e0030e /include | |
| parent | clk: davinci: Remove redundant dev_err calls (diff) | |
| parent | reset: modify the way reset lookup works for board files (diff) | |
| download | linux-ac8e5cc73736fe1ec6c7f3674ee71f7c99c42ae0.tar.xz linux-ac8e5cc73736fe1ec6c7f3674ee71f7c99c42ae0.zip | |
Merge branch 'reset/lookup' of git://git.pengutronix.de/git/pza/linux into clk-davinci
We need this to be able to use the reset_controller_add_lookup() API.
* 'reset/lookup' of git://git.pengutronix.de/git/pza/linux:
reset: modify the way reset lookup works for board files
reset: add support for non-DT systems
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/reset-controller.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h index adb88f8cefbc..9326d671b6e6 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -27,12 +27,38 @@ struct device_node; struct of_phandle_args; /** + * struct reset_control_lookup - represents a single lookup entry + * + * @list: internal list of all reset lookup entries + * @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) + */ +struct reset_control_lookup { + struct list_head list; + const char *provider; + unsigned int index; + const char *dev_id; + const char *con_id; +}; + +#define RESET_LOOKUP(_provider, _index, _dev_id, _con_id) \ + { \ + .provider = _provider, \ + .index = _index, \ + .dev_id = _dev_id, \ + .con_id = _con_id, \ + } + +/** * struct reset_controller_dev - reset controller entity that might * provide multiple reset controls * @ops: a pointer to device specific struct reset_control_ops * @owner: kernel module of the reset controller driver * @list: internal list of reset controller devices * @reset_control_head: head of internal list of requested reset controls + * @dev: corresponding driver model device struct * @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 @@ -44,6 +70,7 @@ struct reset_controller_dev { struct module *owner; struct list_head list; struct list_head reset_control_head; + struct device *dev; struct device_node *of_node; int of_reset_n_cells; int (*of_xlate)(struct reset_controller_dev *rcdev, @@ -58,4 +85,7 @@ struct device; int devm_reset_controller_register(struct device *dev, struct reset_controller_dev *rcdev); +void reset_controller_add_lookup(struct reset_control_lookup *lookup, + unsigned int num_entries); + #endif |