aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2012-09-21 07:34:01 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-09-21 07:34:01 +0900
commitc3ad056b26fe5d5be71b96371b0b2d00b2276ad3 (patch)
tree6af9ffbf815600d85807ac98a37a488f47a39e5d
parent9759e2ebc4bc78c630ad952a288a53d131f1cb53 (diff)
pinctrl: exynos: Correct the detection of wakeup-eint node
Current way of finding the wakeup-eint node scans the whole device tree not only children of the pinctrl node, so it might detect a wakeup-eint node of another pinctrl device. This patch limits the scope of looking for nodes only to subnodes of the pinctrl node. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--drivers/pinctrl/pinctrl-exynos.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 49ef5a2f79a..0d01d19edc9 100644
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -431,15 +431,19 @@ static const struct irq_domain_ops exynos_wkup_irqd_ops = {
static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
{
struct device *dev = d->dev;
- struct device_node *wkup_np;
+ struct device_node *wkup_np = NULL;
+ struct device_node *np;
struct exynos_weint_data *weint_data;
int idx, irq;
- wkup_np = of_find_matching_node(dev->of_node, exynos_wkup_irq_ids);
- if (!wkup_np) {
- dev_err(dev, "wakeup controller node not found\n");
- return -ENODEV;
+ for_each_child_of_node(dev->of_node, np) {
+ if (of_match_node(exynos_wkup_irq_ids, np)) {
+ wkup_np = np;
+ break;
+ }
}
+ if (!wkup_np)
+ return -ENODEV;
d->wkup_irqd = irq_domain_add_linear(wkup_np, d->ctrl->nr_wint,
&exynos_wkup_irqd_ops, d);