Commit 729c9d91 authored by Agrawal, Nitesh-kumar's avatar Agrawal, Nitesh-kumar Committed by Luis Henriques

pinctrl/amd: switch to using a bool for level

The earlier patch can be simplified by using a bool
to indicate level trigger.

BugLink: http://bugs.launchpad.net/bugs/1612006Reviewed-by: default avatarPankaj Sen <Pankaj.Sen@amd.com>
Signed-off-by: default avatarNitesh Kumar Agrawal <Nitesh-kumar.Agrawal@amd.com>
[Fixup to earlier manually applied patch]
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>

(cherry picked from commit e084448b)
Signed-off-by: default avatarAlex Hung <alex.hung@canonical.com>
Acked-by: default avatarRobert Hooker <robert.hooker@canonical.com>
Acked-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent ec76b6e0
...@@ -388,7 +388,7 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -388,7 +388,7 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
int ret = 0; int ret = 0;
u32 pin_reg; u32 pin_reg;
unsigned long flags; unsigned long flags;
u32 level_trig; bool level_trig;
u32 active_level; u32 active_level;
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct amd_gpio *gpio_dev = to_amd_gpio(gc); struct amd_gpio *gpio_dev = to_amd_gpio(gc);
...@@ -401,13 +401,12 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -401,13 +401,12 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
* default settings, ignore incoming settings from client and use * default settings, ignore incoming settings from client and use
* BIOS settings to configure GPIO register. * BIOS settings to configure GPIO register.
*/ */
level_trig = pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF); level_trig = !(pin_reg & (LEVEL_TRIGGER << LEVEL_TRIG_OFF));
active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF); active_level = pin_reg & (ACTIVE_LEVEL_MASK << ACTIVE_LEVEL_OFF);
if((!level_trig) && if(level_trig &&
((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH)) { ((active_level >> ACTIVE_LEVEL_OFF) == ACTIVE_HIGH))
type = IRQ_TYPE_EDGE_FALLING; type = IRQ_TYPE_EDGE_FALLING;
}
switch (type & IRQ_TYPE_SENSE_MASK) { switch (type & IRQ_TYPE_SENSE_MASK) {
case IRQ_TYPE_EDGE_RISING: case IRQ_TYPE_EDGE_RISING:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment