Message ID | 61a2d2f5-2d84-af87-deda-adba064b1dba@amd.com |
---|---|
State | New |
Headers | show |
On Thu, Dec 8, 2016 at 1:01 PM, Shyam Sundar S K <ssundark@amd.com> wrote: > In the function amd_gpio_irq_set_type, read the values from > the ACPI table to set the level and drop the settings passed > by the client. > > Reviewed-by: Pankaj Sen <Pankaj.Sen@amd.com> > Reviewed-by: Nitesh Kumar Agrawal <Nitesh-kumar.Agrawal@amd.com> > Reviewed-by: Shah, Nehal-bakulchandra <Nehal-bakulchandra.Shah@amd.com> > Signed-off-by: Shyam-sundar S-k <Shyam-sundar.S-k@amd.com> Patch applied. The code makes a lot more sense now, too. > - /* > - * When level_trig is set EDGE and active_level is set HIGH in BIOS > - * default settings, ignore incoming settings from client and use > - * BIOS settings to configure GPIO register. > + /* Ignore the settings coming from the client and > + * read the values from the ACPI tables > + * while setting the trigger type In my book you do the exact opposite: the client/consumer is the device making use of this IRQ, and that defines what trigger to set. Before this, you let the hardware power-on defaults define the trigger, which was probably not such a good idea. But it's just a comment so I don't care much. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index aea310a..c9a1469 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -382,26 +382,21 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type) { int ret = 0; u32 pin_reg; - unsigned long flags; - bool level_trig; - u32 active_level; + unsigned long flags, irq_flags; struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct amd_gpio *gpio_dev = gpiochip_get_data(gc); spin_lock_irqsave(&gpio_dev->lock, flags); pin_reg = readl(gpio_dev->base + (d->hwirq)*4); - /* - * When level_trig is set EDGE and active_level is set HIGH in BIOS - * default settings, ignore incoming settings from client and use - * BIOS settings to configure GPIO register. + /* Ignore the settings coming from the client and + * read the values from the ACPI tables + * while setting the trigger type */ - level_trig = !(pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF)); - active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF); - if(level_trig && - ((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH)) - type = IRQ_TYPE_EDGE_FALLING; + irq_flags = irq_get_trigger_type(d->irq); + if (irq_flags != IRQ_TYPE_NONE) + type = irq_flags; switch (type & IRQ_TYPE_SENSE_MASK) { case IRQ_TYPE_EDGE_RISING: