* [PATCH 0/2] gpio: omap: set_debounce fixes @ 2017-03-17 1:48 David Rivshin 2017-03-17 1:48 ` [PATCH 1/2] gpio: omap: return error if requested debounce time is not possible David Rivshin 2017-03-17 1:48 ` [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate David Rivshin 0 siblings, 2 replies; 6+ messages in thread From: David Rivshin @ 2017-03-17 1:48 UTC (permalink / raw) To: linux-gpio, linux-omap, Grygorii Strashko Cc: Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm, linux-kernel, stable From: David Rivshin <drivshin@allworx.com> This series fixes a couple of issues in the gpio-omap set_debounce logic. Patches based ontop of v4.11-rc1, but apply cleanly to linux-gpio/fixes and linux-next. Tested on a (custom) AM335x board via gpio-keys. (Apologies if anyone received this series twice, it seemed to fail the first time due to a typo. Please ignore the any previous copy.) David Rivshin (2): gpio: omap: return error if requested debounce time is not possible gpio: omap: compute debounce-time from actual debounce-clock rate drivers/gpio/gpio-omap.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 2.9.3 base-commit: c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] gpio: omap: return error if requested debounce time is not possible 2017-03-17 1:48 [PATCH 0/2] gpio: omap: set_debounce fixes David Rivshin @ 2017-03-17 1:48 ` David Rivshin 2017-03-17 1:48 ` [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate David Rivshin 1 sibling, 0 replies; 6+ messages in thread From: David Rivshin @ 2017-03-17 1:48 UTC (permalink / raw) To: linux-gpio, linux-omap, Grygorii Strashko Cc: Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm, linux-kernel, stable From: David Rivshin <DRivshin@allworx.com> omap_gpio_debounce() does not validate that the requested debounce is within a range it can handle. Instead it lets the register value wrap silently, and always returns success. This can lead to all sorts of unexpected behavior, such as gpio_keys asking for a too-long debounce, but getting a very short debounce in practice. Fix this by returning -EINVAL if the requested value does not fit into the register field. If there is no debounce clock available at all, return -ENOTSUPP. Fixes: e85ec6c3047b ("gpio: omap: fix omap2_set_gpio_debounce") Cc: <stable@vger.kernel.org> # 4.3+ Signed-off-by: David Rivshin <drivshin@allworx.com> --- drivers/gpio/gpio-omap.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index efc85a2..c40dbdd 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -208,9 +208,11 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) * 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. + * + * Return: 0 on success, negative error otherwise. */ -static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, - unsigned debounce) +static int omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, + unsigned debounce) { void __iomem *reg; u32 val; @@ -218,11 +220,12 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, bool enable = !!debounce; if (!bank->dbck_flag) - return; + return -ENOTSUPP; if (enable) { debounce = DIV_ROUND_UP(debounce, 31) - 1; - debounce &= OMAP4_GPIO_DEBOUNCINGTIME_MASK; + if ((debounce & OMAP4_GPIO_DEBOUNCINGTIME_MASK) != debounce) + return -EINVAL; } l = BIT(offset); @@ -255,6 +258,8 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, bank->context.debounce = debounce; bank->context.debounce_en = val; } + + return 0; } /** @@ -964,14 +969,15 @@ static int omap_gpio_debounce(struct gpio_chip *chip, unsigned offset, { struct gpio_bank *bank; unsigned long flags; + int ret; bank = gpiochip_get_data(chip); raw_spin_lock_irqsave(&bank->lock, flags); - omap2_set_gpio_debounce(bank, offset, debounce); + ret = omap2_set_gpio_debounce(bank, offset, debounce); raw_spin_unlock_irqrestore(&bank->lock, flags); - return 0; + return ret; } static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset, -- 2.9.3 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate 2017-03-17 1:48 [PATCH 0/2] gpio: omap: set_debounce fixes David Rivshin 2017-03-17 1:48 ` [PATCH 1/2] gpio: omap: return error if requested debounce time is not possible David Rivshin @ 2017-03-17 1:48 ` David Rivshin 1 sibling, 0 replies; 6+ messages in thread From: David Rivshin @ 2017-03-17 1:48 UTC (permalink / raw) To: linux-gpio, linux-omap, Grygorii Strashko Cc: Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm, linux-kernel, stable From: David Rivshin <DRivshin@allworx.com> omap2_set_gpio_debounce() assumes the debounce clock runs at 32768Hz, leading to 31us granularity. In reality the debounce clock (which is provided by other modules) could be at different rate, leading to an incorrect computation of the number of debounce clock cycles for GPIO_DEBOUNCINGTIME[DEBOUNCETIME]. Also, even with a standard 32768Hz input clock, the actual granularity is ~30.5us. This leads to the actual debounce time being ~1.5% too short. Fix both issues by simply querying the dbck rate, rather than hardcoding. Fixes: e85ec6c3047b ("gpio: omap: fix omap2_set_gpio_debounce") Cc: <stable@vger.kernel.org> # 4.3+ Signed-off-by: David Rivshin <drivshin@allworx.com> --- This logical bug existed before e85ec6c3047b, but if backporting further it's probably best to just cherry-pick/backport e85ec6c3047b first. drivers/gpio/gpio-omap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index c40dbdd..66dbe37 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -205,8 +205,8 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) * @offset: the gpio number on this @bank * @debounce: debounce time to use * - * OMAP's debounce time is in 31us steps - * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) x 31 + * OMAP's debounce time is in 1/DBCK steps + * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) / DBCK * so we need to convert and round up to the closest unit. * * Return: 0 on success, negative error otherwise. @@ -223,7 +223,9 @@ static int omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, return -ENOTSUPP; if (enable) { - debounce = DIV_ROUND_UP(debounce, 31) - 1; + u64 tmp = (u64)debounce * clk_get_rate(bank->dbck); + + debounce = DIV_ROUND_UP_ULL(tmp, 1000000) - 1; if ((debounce & OMAP4_GPIO_DEBOUNCINGTIME_MASK) != debounce) return -EINVAL; } -- 2.9.3 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20170317005704.11971-1-drivshin@awxrd.com>]
[parent not found: <20170317005704.11971-3-drivshin@awxrd.com>]
[parent not found: <adc98bfd-ebce-49f0-5991-3c6a1e99ec25@ti.com>]
* Re: [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate [not found] ` <adc98bfd-ebce-49f0-5991-3c6a1e99ec25@ti.com> @ 2017-03-17 23:14 ` David Rivshin 2017-03-18 0:06 ` Grygorii Strashko 0 siblings, 1 reply; 6+ messages in thread From: David Rivshin @ 2017-03-17 23:14 UTC (permalink / raw) To: Grygorii Strashko Cc: linux-gpio, linux-omap, Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm-kernel, linux-kernel On Fri, 17 Mar 2017 14:43:02 -0500 Grygorii Strashko <grygorii.strashko@ti.com> wrote: > On 03/16/2017 07:57 PM, David Rivshin wrote: > > From: David Rivshin <DRivshin@allworx.com> > > > > omap2_set_gpio_debounce() assumes the debounce clock runs at 32768Hz, > > leading to 31us granularity. In reality the debounce clock (which > > is provided by other modules) could be at different rate, leading to > > an incorrect computation of the number of debounce clock cycles for > > GPIO_DEBOUNCINGTIME[DEBOUNCETIME]. > > > > Also, even with a standard 32768Hz input clock, the actual granularity > > is ~30.5us. This leads to the actual debounce time being ~1.5% too > > short. > > > > Fix both issues by simply querying the dbck rate, rather than > > hardcoding. > > Pls, hold on with this - I'm trying to check it, as it doesn't follow TRMs. Yes, the TRMs are somewhat cryptic about the details, perhaps I can give some more background on how I came to this. I think the chapters for the GPIO block are written with a strong assumption that the input debounce clock is 32768Hz, and further round 1/32768Hz to the nearest whole microsecond (~30.5us->31us). However, at least on AM335x the debounce clock (i.e. the CLK_32KHZ) can be made to run at other rates via the Control Module. Here is an example from clk_summary: clk_24mhz 1 1 24000000 0 0 clkdiv32k_ck 1 1 65536 0 0 clkdiv32k_ick 2 6 65536 0 0 timer7_fck 1 1 65536 0 0 wdt1_fck 0 1 65536 0 0 gpio3_dbclk 0 2 65536 0 0 gpio2_dbclk 0 2 65536 0 0 gpio1_dbclk 0 2 65536 0 0 This is accomplished by setting clk32kdivratio_ctl[clkdivopp50_en] to 1 even while in OPP100, and adjusting the devicetree to match. Timer7 is known to truly have a 65536Hz fck by configuring it as a 50% duty cycle PWM and measuring with an oscilloscope. Here are some relevant sections from the AM335x TRM (spruh73o): 25.2.2 GPIO Clock and Reset Management Debounce Functional clock (GPIO[123]) comes from CLK_32KHZ. 8.1.6.8 Peripheral PLL Description CLK_32KHZ is CLK_24 divided by either 732.4219 or 366.2109. In OPP100 this results in either 32768Hz or 65536Hz. In OPP50 this results in either 16384Hz or 32768Hz. 9.3.1.8 clk32kdivratio_ctrl Register Names of the register and field differ from 8.1.6.8, but it's clear they are the same. I'm not sure if other devices can be similarly cajoled into running their equivalent 32KHZ clocks at a different rate, but it certainly works for AM335x. Checking OMAP4430 TRM as an example makes it look like OMAP44xx has a fixed 32768Hz clock with no adjustment possible (backed up by omap44xx-clocks.dtsi having it just be a fixed-clock). > > > > Fixes: e85ec6c3047b ("gpio: omap: fix omap2_set_gpio_debounce") > > Cc: <stable@vger.kernel.org> # 4.3+ > > Signed-off-by: David Rivshin <drivshin@allworx.com> > > --- > > > > This logical bug existed before e85ec6c3047b, but if backporting > > further it's probably best to just cherry-pick/backport e85ec6c3047b > > first. > > > > drivers/gpio/gpio-omap.c | 8 +++++--- > > 1 file changed, 5 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c > > index 33ec02d..865a831 100644 > > --- a/drivers/gpio/gpio-omap.c > > +++ b/drivers/gpio/gpio-omap.c > > @@ -205,8 +205,8 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) > > * @offset: the gpio number on this @bank > > * @debounce: debounce time to use > > * > > - * OMAP's debounce time is in 31us steps > > - * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) x 31 > > + * OMAP's debounce time is in 1/DBCK steps > > + * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) / DBCK > > * so we need to convert and round up to the closest unit. > > * > > * Return: 0 on success, negative error otherwise. > > @@ -223,7 +223,9 @@ static int omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, > > return -ENOTSUPP; > > > > if (enable) { > > - debounce = DIV_ROUND_UP(debounce, 31) - 1; > > + u64 tmp = (u64)debounce * clk_get_rate(bank->dbck); > > + > > + debounce = DIV_ROUND_UP_ULL(tmp, 1000000) - 1; > > if ((debounce & OMAP4_GPIO_DEBOUNCINGTIME_MASK) != debounce) > > return -EINVAL; > > } > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate 2017-03-17 23:14 ` David Rivshin @ 2017-03-18 0:06 ` Grygorii Strashko 2017-04-20 13:53 ` David Rivshin 0 siblings, 1 reply; 6+ messages in thread From: Grygorii Strashko @ 2017-03-18 0:06 UTC (permalink / raw) To: David Rivshin, Tero Kristo Cc: linux-gpio, linux-omap, Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm-kernel, linux-kernel CC: Tero On 03/17/2017 06:14 PM, David Rivshin wrote: > On Fri, 17 Mar 2017 14:43:02 -0500 > Grygorii Strashko <grygorii.strashko@ti.com> wrote: > >> On 03/16/2017 07:57 PM, David Rivshin wrote: >>> From: David Rivshin <DRivshin@allworx.com> >>> >>> omap2_set_gpio_debounce() assumes the debounce clock runs at 32768Hz, >>> leading to 31us granularity. In reality the debounce clock (which >>> is provided by other modules) could be at different rate, leading to >>> an incorrect computation of the number of debounce clock cycles for >>> GPIO_DEBOUNCINGTIME[DEBOUNCETIME]. >>> >>> Also, even with a standard 32768Hz input clock, the actual granularity >>> is ~30.5us. This leads to the actual debounce time being ~1.5% too >>> short. >>> >>> Fix both issues by simply querying the dbck rate, rather than >>> hardcoding. >> >> Pls, hold on with this - I'm trying to check it, as it doesn't follow TRMs. > > Yes, the TRMs are somewhat cryptic about the details, perhaps I can give > some more background on how I came to this. I think the chapters for the > GPIO block are written with a strong assumption that the input debounce > clock is 32768Hz, and further round 1/32768Hz to the nearest whole > microsecond (~30.5us->31us). > > However, at least on AM335x the debounce clock (i.e. the CLK_32KHZ) can > be made to run at other rates via the Control Module. > > Here is an example from clk_summary: > clk_24mhz 1 1 24000000 0 0 > clkdiv32k_ck 1 1 65536 0 0 > clkdiv32k_ick 2 6 65536 0 0 > timer7_fck 1 1 65536 0 0 > wdt1_fck 0 1 65536 0 0 > gpio3_dbclk 0 2 65536 0 0 > gpio2_dbclk 0 2 65536 0 0 > gpio1_dbclk 0 2 65536 0 0 > > This is accomplished by setting clk32kdivratio_ctl[clkdivopp50_en] to 1 > even while in OPP100, and adjusting the devicetree to match. Timer7 is > known to truly have a 65536Hz fck by configuring it as a 50% duty cycle > PWM and measuring with an oscilloscope. > > Here are some relevant sections from the AM335x TRM (spruh73o): > 25.2.2 GPIO Clock and Reset Management > Debounce Functional clock (GPIO[123]) comes from CLK_32KHZ. > 8.1.6.8 Peripheral PLL Description > CLK_32KHZ is CLK_24 divided by either 732.4219 or 366.2109. > In OPP100 this results in either 32768Hz or 65536Hz. > In OPP50 this results in either 16384Hz or 32768Hz. > 9.3.1.8 clk32kdivratio_ctrl Register > Names of the register and field differ from 8.1.6.8, but it's > clear they are the same. > > I'm not sure if other devices can be similarly cajoled into running > their equivalent 32KHZ clocks at a different rate, but it certainly > works for AM335x. Checking OMAP4430 TRM as an example makes it look > like OMAP44xx has a fixed 32768Hz clock with no adjustment possible > (backed up by omap44xx-clocks.dtsi having it just be a fixed-clock). > > >>> >>> Fixes: e85ec6c3047b ("gpio: omap: fix omap2_set_gpio_debounce") >>> Cc: <stable@vger.kernel.org> # 4.3+ >>> Signed-off-by: David Rivshin <drivshin@allworx.com> >>> --- >>> >>> This logical bug existed before e85ec6c3047b, but if backporting >>> further it's probably best to just cherry-pick/backport e85ec6c3047b >>> first. >>> >>> drivers/gpio/gpio-omap.c | 8 +++++--- >>> 1 file changed, 5 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c >>> index 33ec02d..865a831 100644 >>> --- a/drivers/gpio/gpio-omap.c >>> +++ b/drivers/gpio/gpio-omap.c >>> @@ -205,8 +205,8 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) >>> * @offset: the gpio number on this @bank >>> * @debounce: debounce time to use >>> * >>> - * OMAP's debounce time is in 31us steps >>> - * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) x 31 >>> + * OMAP's debounce time is in 1/DBCK steps >>> + * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) / DBCK >>> * so we need to convert and round up to the closest unit. >>> * >>> * Return: 0 on success, negative error otherwise. >>> @@ -223,7 +223,9 @@ static int omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, >>> return -ENOTSUPP; >>> >>> if (enable) { >>> - debounce = DIV_ROUND_UP(debounce, 31) - 1; >>> + u64 tmp = (u64)debounce * clk_get_rate(bank->dbck); >>> + >>> + debounce = DIV_ROUND_UP_ULL(tmp, 1000000) - 1; >>> if ((debounce & OMAP4_GPIO_DEBOUNCINGTIME_MASK) != debounce) >>> return -EINVAL; >>> } >>> >> > -- regards, -grygorii ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate 2017-03-18 0:06 ` Grygorii Strashko @ 2017-04-20 13:53 ` David Rivshin 0 siblings, 0 replies; 6+ messages in thread From: David Rivshin @ 2017-04-20 13:53 UTC (permalink / raw) To: Grygorii Strashko, Tero Kristo Cc: linux-gpio, linux-omap, Santosh Shilimkar, Kevin Hilman, Linus Walleij, Alexandre Courbot, linux-arm-kernel, linux-kernel On Fri, 17 Mar 2017 19:06:47 -0500 Grygorii Strashko <grygorii.strashko@ti.com> wrote: > CC: Tero Gentle ping. Any thoughts on this? Is there anything I should investigate, or other information you'd like me to provide? > On 03/17/2017 06:14 PM, David Rivshin wrote: > > On Fri, 17 Mar 2017 14:43:02 -0500 > > Grygorii Strashko <grygorii.strashko@ti.com> wrote: > > > >> On 03/16/2017 07:57 PM, David Rivshin wrote: > >>> From: David Rivshin <DRivshin@allworx.com> > >>> > >>> omap2_set_gpio_debounce() assumes the debounce clock runs at 32768Hz, > >>> leading to 31us granularity. In reality the debounce clock (which > >>> is provided by other modules) could be at different rate, leading to > >>> an incorrect computation of the number of debounce clock cycles for > >>> GPIO_DEBOUNCINGTIME[DEBOUNCETIME]. > >>> > >>> Also, even with a standard 32768Hz input clock, the actual granularity > >>> is ~30.5us. This leads to the actual debounce time being ~1.5% too > >>> short. > >>> > >>> Fix both issues by simply querying the dbck rate, rather than > >>> hardcoding. > >> > >> Pls, hold on with this - I'm trying to check it, as it doesn't follow TRMs. > > > > Yes, the TRMs are somewhat cryptic about the details, perhaps I can give > > some more background on how I came to this. I think the chapters for the > > GPIO block are written with a strong assumption that the input debounce > > clock is 32768Hz, and further round 1/32768Hz to the nearest whole > > microsecond (~30.5us->31us). > > > > However, at least on AM335x the debounce clock (i.e. the CLK_32KHZ) can > > be made to run at other rates via the Control Module. > > > > Here is an example from clk_summary: > > clk_24mhz 1 1 24000000 0 0 > > clkdiv32k_ck 1 1 65536 0 0 > > clkdiv32k_ick 2 6 65536 0 0 > > timer7_fck 1 1 65536 0 0 > > wdt1_fck 0 1 65536 0 0 > > gpio3_dbclk 0 2 65536 0 0 > > gpio2_dbclk 0 2 65536 0 0 > > gpio1_dbclk 0 2 65536 0 0 > > > > This is accomplished by setting clk32kdivratio_ctl[clkdivopp50_en] to 1 > > even while in OPP100, and adjusting the devicetree to match. Timer7 is > > known to truly have a 65536Hz fck by configuring it as a 50% duty cycle > > PWM and measuring with an oscilloscope. > > > > Here are some relevant sections from the AM335x TRM (spruh73o): > > 25.2.2 GPIO Clock and Reset Management > > Debounce Functional clock (GPIO[123]) comes from CLK_32KHZ. > > 8.1.6.8 Peripheral PLL Description > > CLK_32KHZ is CLK_24 divided by either 732.4219 or 366.2109. > > In OPP100 this results in either 32768Hz or 65536Hz. > > In OPP50 this results in either 16384Hz or 32768Hz. > > 9.3.1.8 clk32kdivratio_ctrl Register > > Names of the register and field differ from 8.1.6.8, but it's > > clear they are the same. > > > > I'm not sure if other devices can be similarly cajoled into running > > their equivalent 32KHZ clocks at a different rate, but it certainly > > works for AM335x. Checking OMAP4430 TRM as an example makes it look > > like OMAP44xx has a fixed 32768Hz clock with no adjustment possible > > (backed up by omap44xx-clocks.dtsi having it just be a fixed-clock). > > > > > >>> > >>> Fixes: e85ec6c3047b ("gpio: omap: fix omap2_set_gpio_debounce") > >>> Cc: <stable@vger.kernel.org> # 4.3+ > >>> Signed-off-by: David Rivshin <drivshin@allworx.com> > >>> --- > >>> > >>> This logical bug existed before e85ec6c3047b, but if backporting > >>> further it's probably best to just cherry-pick/backport e85ec6c3047b > >>> first. > >>> > >>> drivers/gpio/gpio-omap.c | 8 +++++--- > >>> 1 file changed, 5 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c > >>> index 33ec02d..865a831 100644 > >>> --- a/drivers/gpio/gpio-omap.c > >>> +++ b/drivers/gpio/gpio-omap.c > >>> @@ -205,8 +205,8 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) > >>> * @offset: the gpio number on this @bank > >>> * @debounce: debounce time to use > >>> * > >>> - * OMAP's debounce time is in 31us steps > >>> - * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) x 31 > >>> + * OMAP's debounce time is in 1/DBCK steps > >>> + * <debounce time> = (GPIO_DEBOUNCINGTIME[7:0].DEBOUNCETIME + 1) / DBCK > >>> * so we need to convert and round up to the closest unit. > >>> * > >>> * Return: 0 on success, negative error otherwise. > >>> @@ -223,7 +223,9 @@ static int omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, > >>> return -ENOTSUPP; > >>> > >>> if (enable) { > >>> - debounce = DIV_ROUND_UP(debounce, 31) - 1; > >>> + u64 tmp = (u64)debounce * clk_get_rate(bank->dbck); > >>> + > >>> + debounce = DIV_ROUND_UP_ULL(tmp, 1000000) - 1; > >>> if ((debounce & OMAP4_GPIO_DEBOUNCINGTIME_MASK) != debounce) > >>> return -EINVAL; > >>> } > >>> > >> > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-20 13:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-17 1:48 [PATCH 0/2] gpio: omap: set_debounce fixes David Rivshin
2017-03-17 1:48 ` [PATCH 1/2] gpio: omap: return error if requested debounce time is not possible David Rivshin
2017-03-17 1:48 ` [PATCH 2/2] gpio: omap: compute debounce-time from actual debounce-clock rate David Rivshin
[not found] <20170317005704.11971-1-drivshin@awxrd.com>
[not found] ` <20170317005704.11971-3-drivshin@awxrd.com>
[not found] ` <adc98bfd-ebce-49f0-5991-3c6a1e99ec25@ti.com>
2017-03-17 23:14 ` David Rivshin
2017-03-18 0:06 ` Grygorii Strashko
2017-04-20 13:53 ` David Rivshin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®