lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 070/166] gpio: msm: Fix irq mask/unmask by writing bits instead of numbers
    Date
    3.8.13.16 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stephen Boyd <sboyd@codeaurora.org>

    commit 4cc629b7a20945ce35628179180329b6bc9e552b upstream.

    We should be writing bits here but instead we're writing the
    numbers that correspond to the bits we want to write. Fix it by
    wrapping the numbers in the BIT() macro. This fixes gpios acting
    as interrupts.

    Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpio/gpio-msm-v2.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
    index 55a7e77..0152b1a 100644
    --- a/drivers/gpio/gpio-msm-v2.c
    +++ b/drivers/gpio/gpio-msm-v2.c
    @@ -249,7 +249,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)

    spin_lock_irqsave(&tlmm_lock, irq_flags);
    writel(TARGET_PROC_NONE, GPIO_INTR_CFG_SU(gpio));
    - clear_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));
    + clear_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));
    __clear_bit(gpio, msm_gpio.enabled_irqs);
    spin_unlock_irqrestore(&tlmm_lock, irq_flags);
    }
    @@ -261,7 +261,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)

    spin_lock_irqsave(&tlmm_lock, irq_flags);
    __set_bit(gpio, msm_gpio.enabled_irqs);
    - set_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));
    + set_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));
    writel(TARGET_PROC_SCORPION, GPIO_INTR_CFG_SU(gpio));
    spin_unlock_irqrestore(&tlmm_lock, irq_flags);
    }
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-01-16 00:01    [W:4.169 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site