|
@@ -531,6 +531,21 @@ static int sunxi_pinctrl_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
|
|
|
return irq_find_mapping(pctl->domain, desc->irqnum);
|
|
|
}
|
|
|
|
|
|
+static int sunxi_pinctrl_irq_request_resources(struct irq_data *d)
|
|
|
+{
|
|
|
+ struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
|
|
|
+ struct sunxi_desc_function *func;
|
|
|
+
|
|
|
+ func = sunxi_pinctrl_desc_find_function_by_pin(pctl,
|
|
|
+ pctl->irq_array[d->hwirq], "irq");
|
|
|
+ if (!func)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ /* Change muxing to INT mode */
|
|
|
+ sunxi_pmx_set(pctl->pctl_dev, pctl->irq_array[d->hwirq], func->muxval);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
|
|
|
static int sunxi_pinctrl_irq_set_type(struct irq_data *d,
|
|
|
unsigned int type)
|
|
@@ -603,19 +618,11 @@ static void sunxi_pinctrl_irq_mask(struct irq_data *d)
|
|
|
static void sunxi_pinctrl_irq_unmask(struct irq_data *d)
|
|
|
{
|
|
|
struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
|
|
|
- struct sunxi_desc_function *func;
|
|
|
u32 reg = sunxi_irq_ctrl_reg(d->hwirq);
|
|
|
u8 idx = sunxi_irq_ctrl_offset(d->hwirq);
|
|
|
unsigned long flags;
|
|
|
u32 val;
|
|
|
|
|
|
- func = sunxi_pinctrl_desc_find_function_by_pin(pctl,
|
|
|
- pctl->irq_array[d->hwirq],
|
|
|
- "irq");
|
|
|
-
|
|
|
- /* Change muxing to INT mode */
|
|
|
- sunxi_pmx_set(pctl->pctl_dev, pctl->irq_array[d->hwirq], func->muxval);
|
|
|
-
|
|
|
spin_lock_irqsave(&pctl->lock, flags);
|
|
|
|
|
|
/* Unmask the IRQ */
|
|
@@ -629,6 +636,7 @@ static struct irq_chip sunxi_pinctrl_irq_chip = {
|
|
|
.irq_ack = sunxi_pinctrl_irq_ack,
|
|
|
.irq_mask = sunxi_pinctrl_irq_mask,
|
|
|
.irq_unmask = sunxi_pinctrl_irq_unmask,
|
|
|
+ .irq_request_resources = sunxi_pinctrl_irq_request_resources,
|
|
|
.irq_set_type = sunxi_pinctrl_irq_set_type,
|
|
|
.flags = IRQCHIP_SKIP_SET_WAKE,
|
|
|
};
|