Commit e85ec6c3 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Linus Walleij

gpio: omap: fix omap2_set_gpio_debounce

According to TRMs:

Required input line stable =
  (the value of the GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) × 31,
where the value of the GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME bit field
is from 0 to 255.

But now omap2_set_gpio_debounce() will calculate debounce time and
behave incorrectly in the following cases:
1) requested debounce time is !0 and <32
   calculated DEBOUNCETIME = 0x1 == 62 us;
   expected value of DEBOUNCETIME = 0x0 == 31us
2) requested debounce time is 0
   calculated DEBOUNCETIME = 0x1 == 62 us;
   expected: disable debounce and DEBOUNCETIME = 0x0
3) requested debounce time is >32 and <63
   calculated DEBOUNCETIME = 0x0 and debounce will be disabled;
   expected: enable debounce and DEBOUNCETIME = 0x1 == 62 us

Hence, rework omap2_set_gpio_debounce() to fix above cases:
1) introduce local variable "enable" and use it to identify
when debounce need to be enabled or disabled. Disable debounce
if requested debounce time is 0.
2) use below formula for debounce time calculation:
   debounce = (DIV_ROUND_UP(debounce, 31) - 1) & 0xFF;
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 89d18e3a
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/gpio-omap.h>
#define OFF_MODE 1 #define OFF_MODE 1
#define OMAP4_GPIO_DEBOUNCINGTIME_MASK 0xFF
static LIST_HEAD(omap_gpio_list); static LIST_HEAD(omap_gpio_list);
...@@ -204,8 +205,9 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) ...@@ -204,8 +205,9 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank)
* @offset: the gpio number on this @bank * @offset: the gpio number on this @bank
* @debounce: debounce time to use * @debounce: debounce time to use
* *
* OMAP's debounce time is in 31us steps so we need * OMAP's debounce time is in 31us steps
* to convert and round up to the closest unit. * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) x 31
* so we need to convert and round up to the closest unit.
*/ */
static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset,
unsigned debounce) unsigned debounce)
...@@ -213,16 +215,15 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, ...@@ -213,16 +215,15 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset,
void __iomem *reg; void __iomem *reg;
u32 val; u32 val;
u32 l; u32 l;
bool enable = !!debounce;
if (!bank->dbck_flag) if (!bank->dbck_flag)
return; return;
if (debounce < 32) if (enable) {
debounce = 0x01; debounce = DIV_ROUND_UP(debounce, 31) - 1;
else if (debounce > 7936) debounce &= OMAP4_GPIO_DEBOUNCINGTIME_MASK;
debounce = 0xff; }
else
debounce = (debounce / 0x1f) - 1;
l = BIT(offset); l = BIT(offset);
...@@ -233,7 +234,7 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, ...@@ -233,7 +234,7 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset,
reg = bank->base + bank->regs->debounce_en; reg = bank->base + bank->regs->debounce_en;
val = readl_relaxed(reg); val = readl_relaxed(reg);
if (debounce) if (enable)
val |= l; val |= l;
else else
val &= ~l; val &= ~l;
......
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