Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3ad056b authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

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: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9759e2eb

drivers/pinctrl/pinctrl-exynos.c

+9 −5
Original line number Diff line number Diff line
@@ -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);