Kaynağa Gözat

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: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Grygorii Strashko 10 yıl önce
ebeveyn
işleme
e85ec6c304
1 değiştirilmiş dosya ile 10 ekleme ve 9 silme
  1. 10 9
      drivers/gpio/gpio-omap.c

+ 10 - 9
drivers/gpio/gpio-omap.c

@@ -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)
  * @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
- * to convert and round up to the closest unit.
+ * OMAP's debounce time is in 31us steps
+ *   <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,
 	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)
-		debounce = 0x01;
-	else if (debounce > 7936)
-		debounce = 0xff;
-	else
-		debounce = (debounce / 0x1f) - 1;
+	if (enable) {
+		debounce = DIV_ROUND_UP(debounce, 31) - 1;
+		debounce &= OMAP4_GPIO_DEBOUNCINGTIME_MASK;
+	}
 
 
 	l = BIT(offset);
 	l = BIT(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;