In order to be able to request an array of reset controls in acquired or released mode, add the acquired flag to of_reset_control_array_get() and pass the flag to subsequent calls of __of_reset_control_get().
Showing the changes to include/linux (1 of 3 files). Show all
Unified · Split
| @@ -32,7 +32,8 @@ struct reset_control *__devm_reset_control_get(struct device *dev, · 31 unmodified lines | |||
| 32 | struct reset_control *devm_reset_control_array_get(struct device *dev, | 32 | struct reset_control *devm_reset_control_array_get(struct device *dev, |
| 33 | bool shared, bool optional); | 33 | bool shared, bool optional); |
| 34 | struct reset_control *of_reset_control_array_get(struct device_node *np, | 34 | struct reset_control *of_reset_control_array_get(struct device_node *np, |
| 35 | bool shared, bool optional); | 35 | bool shared, bool optional, |
| 36 | bool acquired); | ||
| 36 | 37 | ||
| 37 | int reset_control_get_count(struct device *dev); | 38 | int reset_control_get_count(struct device *dev); |
| 38 | 39 | ||
| @@ -107,7 +108,8 @@ devm_reset_control_array_get(struct device *dev, bool shared, bool optional) · 68 unmodified lines | |||
| 107 | } | 108 | } |
| 108 | 109 | ||
| 109 | static inline struct reset_control * | 110 | static inline struct reset_control * |
| 110 | of_reset_control_array_get(struct device_node *np, bool shared, bool optional) | 111 | of_reset_control_array_get(struct device_node *np, bool shared, bool optional, |
| 112 | bool acquired) | ||
| 111 | { | 113 | { |
| 112 | return optional ? NULL : ERR_PTR(-ENOTSUPP); | 114 | return optional ? NULL : ERR_PTR(-ENOTSUPP); |
| 113 | } | 115 | } |
| @@ -465,24 +467,24 @@ devm_reset_control_array_get_optional_shared(struct device *dev) · 351 unmodified lines | |||
| 465 | static inline struct reset_control * | 467 | static inline struct reset_control * |
| 466 | of_reset_control_array_get_exclusive(struct device_node *node) | 468 | of_reset_control_array_get_exclusive(struct device_node *node) |
| 467 | { | 469 | { |
| 468 | return of_reset_control_array_get(node, false, false); | 470 | return of_reset_control_array_get(node, false, false, true); |
| 469 | } | 471 | } |
| 470 | 472 | ||
| 471 | static inline struct reset_control * | 473 | static inline struct reset_control * |
| 472 | of_reset_control_array_get_shared(struct device_node *node) | 474 | of_reset_control_array_get_shared(struct device_node *node) |
| 473 | { | 475 | { |
| 474 | return of_reset_control_array_get(node, true, false); | 476 | return of_reset_control_array_get(node, true, false, true); |
| 475 | } | 477 | } |
| 476 | 478 | ||
| 477 | static inline struct reset_control * | 479 | static inline struct reset_control * |
| 478 | of_reset_control_array_get_optional_exclusive(struct device_node *node) | 480 | of_reset_control_array_get_optional_exclusive(struct device_node *node) |
| 479 | { | 481 | { |
| 480 | return of_reset_control_array_get(node, false, true); | 482 | return of_reset_control_array_get(node, false, true, true); |
| 481 | } | 483 | } |
| 482 | 484 | ||
| 483 | static inline struct reset_control * | 485 | static inline struct reset_control * |
| 484 | of_reset_control_array_get_optional_shared(struct device_node *node) | 486 | of_reset_control_array_get_optional_shared(struct device_node *node) |
| 485 | { | 487 | { |
| 486 | return of_reset_control_array_get(node, true, true); | 488 | return of_reset_control_array_get(node, true, true, true); |
| 487 | } | 489 | } |
| 488 | #endif | 490 | #endif |