mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
--- a/drivers/reset/core.c
|
|
+++ b/drivers/reset/core.c
|
|
@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_
|
|
EXPORT_SYMBOL_GPL(reset_control_deassert);
|
|
|
|
/**
|
|
- * reset_control_get - Lookup and obtain a reference to a reset controller.
|
|
- * @dev: device to be reset by the controller
|
|
+ * of_reset_control_get - Lookup and obtain a reference to a reset controller.
|
|
+ * @node: device to be reset by the controller
|
|
* @id: reset line name
|
|
*
|
|
* Returns a struct reset_control or IS_ERR() condition containing errno.
|
|
*
|
|
* Use of id names is optional.
|
|
*/
|
|
-struct reset_control *reset_control_get(struct device *dev, const char *id)
|
|
+struct reset_control *of_reset_control_get(struct device_node *node,
|
|
+ const char *id)
|
|
{
|
|
struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER);
|
|
struct reset_controller_dev *r, *rcdev;
|
|
@@ -144,13 +145,10 @@ struct reset_control *reset_control_get(
|
|
int rstc_id;
|
|
int ret;
|
|
|
|
- if (!dev)
|
|
- return ERR_PTR(-EINVAL);
|
|
-
|
|
if (id)
|
|
- index = of_property_match_string(dev->of_node,
|
|
+ index = of_property_match_string(node,
|
|
"reset-names", id);
|
|
- ret = of_parse_phandle_with_args(dev->of_node, "resets", "#reset-cells",
|
|
+ ret = of_parse_phandle_with_args(node, "resets", "#reset-cells",
|
|
index, &args);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
@@ -185,12 +183,35 @@ struct reset_control *reset_control_get(
|
|
return ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
- rstc->dev = dev;
|
|
rstc->rcdev = rcdev;
|
|
rstc->id = rstc_id;
|
|
|
|
return rstc;
|
|
}
|
|
+EXPORT_SYMBOL_GPL(of_reset_control_get);
|
|
+
|
|
+/**
|
|
+ * reset_control_get - Lookup and obtain a reference to a reset controller.
|
|
+ * @dev: device to be reset by the controller
|
|
+ * @id: reset line name
|
|
+ *
|
|
+ * Returns a struct reset_control or IS_ERR() condition containing errno.
|
|
+ *
|
|
+ * Use of id names is optional.
|
|
+ */
|
|
+struct reset_control *reset_control_get(struct device *dev, const char *id)
|
|
+{
|
|
+ struct reset_control *rstc;
|
|
+
|
|
+ if (!dev)
|
|
+ return ERR_PTR(-EINVAL);
|
|
+
|
|
+ rstc = of_reset_control_get(dev->of_node, id);
|
|
+ if (!IS_ERR(rstc))
|
|
+ rstc->dev = dev;
|
|
+
|
|
+ return rstc;
|
|
+}
|
|
EXPORT_SYMBOL_GPL(reset_control_get);
|
|
|
|
/**
|
|
--- a/include/linux/reset.h
|
|
+++ b/include/linux/reset.h
|
|
@@ -1,6 +1,8 @@
|
|
#ifndef _LINUX_RESET_H_
|
|
#define _LINUX_RESET_H_
|
|
|
|
+#include <linux/of.h>
|
|
+
|
|
struct device;
|
|
struct reset_control;
|
|
|
|
@@ -8,6 +10,8 @@ int reset_control_reset(struct reset_con
|
|
int reset_control_assert(struct reset_control *rstc);
|
|
int reset_control_deassert(struct reset_control *rstc);
|
|
|
|
+struct reset_control *of_reset_control_get(struct device_node *node,
|
|
+ const char *id);
|
|
struct reset_control *reset_control_get(struct device *dev, const char *id);
|
|
void reset_control_put(struct reset_control *rstc);
|
|
struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
|