]> Pileus Git - ~andy/linux/commitdiff
pinctrl: sirf: put gpio interrupt pin into input status automatically
authorBarry Song <Baohua.Song@csr.com>
Sat, 11 Jan 2014 08:48:43 +0000 (16:48 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 15 Jan 2014 08:10:00 +0000 (09:10 +0100)
busses like i2c, spi and so on can parse the virq of their subnode automatically by
irq_of_parse_and_map(). for example, i2c will do that in of_i2c_register_devices().
people can put hwirq number attached to a gpio controller in dts, and drivers can
directly request the parsed virq.

for example, for an i2c client as below,
tangoc-ts@5c{
compatible = "pixcir,tangoc-ts";
interrupt-parent = <&gpio>;
interrupts = <3 0>;
reg = <0x5c>;
};
in i2c client probe(), it will request_irq(client->irq, ...) without
calling gpio_direction_input().
so here when we set irq type, we also put the pin to input direction.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sirf/pinctrl-sirf.c

index 53a3bc5ac2dd885c1317f362b71a4376ccf4542e..b637f5ab022c4c9e13a65f6b5c9de24c90a40aad 100644 (file)
@@ -560,7 +560,7 @@ static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)
        spin_lock_irqsave(&sgpio_lock, flags);
 
        val = readl(bank->chip.regs + offset);
-       val &= ~SIRFSOC_GPIO_CTL_INTR_STS_MASK;
+       val &= ~(SIRFSOC_GPIO_CTL_INTR_STS_MASK | SIRFSOC_GPIO_CTL_OUT_EN_MASK);
 
        switch (type) {
        case IRQ_TYPE_NONE: