pinctrl: exynos: Consolidate irq domain callbacks
Adding a irq_chip field to the samsung_pin_bank struct helps in consolidating the irq domain callbacks for external gpio and wakeup interrupt controllers. The exynos_wkup_irqd_ops and exynos_gpio_irqd_ops have now been merged into a single exynos_eint_irqd_ops. Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com> Reviewed-by: Thomas Abraham <thomas.ab@samsung.com> Tested-by: Thomas Abraham <thomas.ab@samsung.com> Acked-by: Tomasz Figa <tomasz.figa@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
This commit is contained in:
parent
0d3d30db93
commit
6f5e41bd8f
|
@ -254,7 +254,7 @@ static struct exynos_irq_chip exynos_gpio_irq_chip = {
|
||||||
.eint_pend = EXYNOS_GPIO_EPEND_OFFSET,
|
.eint_pend = EXYNOS_GPIO_EPEND_OFFSET,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int exynos_gpio_irq_map(struct irq_domain *h, unsigned int virq,
|
static int exynos_eint_irq_map(struct irq_domain *h, unsigned int virq,
|
||||||
irq_hw_number_t hw)
|
irq_hw_number_t hw)
|
||||||
{
|
{
|
||||||
struct samsung_pin_bank *b = h->host_data;
|
struct samsung_pin_bank *b = h->host_data;
|
||||||
|
@ -267,10 +267,10 @@ static int exynos_gpio_irq_map(struct irq_domain *h, unsigned int virq,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* irq domain callbacks for external gpio interrupt controller.
|
* irq domain callbacks for external gpio and wakeup interrupt controllers.
|
||||||
*/
|
*/
|
||||||
static const struct irq_domain_ops exynos_gpio_irqd_ops = {
|
static const struct irq_domain_ops exynos_eint_irqd_ops = {
|
||||||
.map = exynos_gpio_irq_map,
|
.map = exynos_eint_irq_map,
|
||||||
.xlate = irq_domain_xlate_twocell,
|
.xlate = irq_domain_xlate_twocell,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -329,7 +329,7 @@ static int exynos_eint_gpio_init(struct samsung_pinctrl_drv_data *d)
|
||||||
if (bank->eint_type != EINT_TYPE_GPIO)
|
if (bank->eint_type != EINT_TYPE_GPIO)
|
||||||
continue;
|
continue;
|
||||||
bank->irq_domain = irq_domain_add_linear(bank->of_node,
|
bank->irq_domain = irq_domain_add_linear(bank->of_node,
|
||||||
bank->nr_pins, &exynos_gpio_irqd_ops, bank);
|
bank->nr_pins, &exynos_eint_irqd_ops, bank);
|
||||||
if (!bank->irq_domain) {
|
if (!bank->irq_domain) {
|
||||||
dev_err(dev, "gpio irq domain add failed\n");
|
dev_err(dev, "gpio irq domain add failed\n");
|
||||||
ret = -ENXIO;
|
ret = -ENXIO;
|
||||||
|
@ -456,26 +456,6 @@ static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)
|
||||||
chained_irq_exit(chip, desc);
|
chained_irq_exit(chip, desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int exynos_wkup_irq_map(struct irq_domain *h, unsigned int virq,
|
|
||||||
irq_hw_number_t hw)
|
|
||||||
{
|
|
||||||
struct samsung_pin_bank *b = h->host_data;
|
|
||||||
|
|
||||||
irq_set_chip_and_handler(virq, &b->irq_chip->chip,
|
|
||||||
handle_level_irq);
|
|
||||||
irq_set_chip_data(virq, h->host_data);
|
|
||||||
set_irq_flags(virq, IRQF_VALID);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* irq domain callbacks for external wakeup interrupt controller.
|
|
||||||
*/
|
|
||||||
static const struct irq_domain_ops exynos_wkup_irqd_ops = {
|
|
||||||
.map = exynos_wkup_irq_map,
|
|
||||||
.xlate = irq_domain_xlate_twocell,
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* exynos_eint_wkup_init() - setup handling of external wakeup interrupts.
|
* exynos_eint_wkup_init() - setup handling of external wakeup interrupts.
|
||||||
* @d: driver data of samsung pinctrl driver.
|
* @d: driver data of samsung pinctrl driver.
|
||||||
|
@ -507,7 +487,7 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
bank->irq_domain = irq_domain_add_linear(bank->of_node,
|
bank->irq_domain = irq_domain_add_linear(bank->of_node,
|
||||||
bank->nr_pins, &exynos_wkup_irqd_ops, bank);
|
bank->nr_pins, &exynos_eint_irqd_ops, bank);
|
||||||
if (!bank->irq_domain) {
|
if (!bank->irq_domain) {
|
||||||
dev_err(dev, "wkup irq domain add failed\n");
|
dev_err(dev, "wkup irq domain add failed\n");
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
Loading…
Reference in a new issue