Skip to content

Commit

Permalink
reset: Add of_reset_control_get
Browse files Browse the repository at this point in the history
In some cases, you might need to deassert from reset an hardware block that
doesn't associated to a struct device (CPUs, timers, etc.).

Add a small helper to retrieve the reset controller from the device tree
without the need to pass a struct device.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  • Loading branch information
mripard authored and pH5 committed Feb 3, 2014
1 parent 0c5b2b9 commit fc0a592
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 9 deletions.
39 changes: 30 additions & 9 deletions drivers/reset/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,16 @@ int reset_control_deassert(struct reset_control *rstc)
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;
Expand All @@ -143,13 +144,10 @@ struct reset_control *reset_control_get(struct device *dev, const char *id)
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);
Expand Down Expand Up @@ -184,12 +182,35 @@ struct reset_control *reset_control_get(struct device *dev, const char *id)
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);

/**
Expand Down
4 changes: 4 additions & 0 deletions include/linux/reset.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
#ifndef _LINUX_RESET_H_
#define _LINUX_RESET_H_

#include <linux/of.h>

struct device;
struct reset_control;

int reset_control_reset(struct reset_control *rstc);
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);
Expand Down

0 comments on commit fc0a592

Please sign in to comment.