|
@@ -208,13 +208,13 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank)
|
|
|
/**
|
|
|
* omap2_set_gpio_debounce - low level gpio debounce time
|
|
|
* @bank: the gpio bank we're acting upon
|
|
|
- * @gpio: the gpio number on this @gpio
|
|
|
+ * @offset: the gpio number on this @bank
|
|
|
* @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.
|
|
|
*/
|
|
|
-static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
|
|
|
+static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset,
|
|
|
unsigned debounce)
|
|
|
{
|
|
|
void __iomem *reg;
|
|
@@ -231,7 +231,7 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
|
|
|
else
|
|
|
debounce = (debounce / 0x1f) - 1;
|
|
|
|
|
|
- l = GPIO_BIT(bank, gpio);
|
|
|
+ l = BIT(offset);
|
|
|
|
|
|
clk_prepare_enable(bank->dbck);
|
|
|
reg = bank->base + bank->regs->debounce;
|
|
@@ -266,16 +266,16 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
|
|
|
/**
|
|
|
* omap_clear_gpio_debounce - clear debounce settings for a gpio
|
|
|
* @bank: the gpio bank we're acting upon
|
|
|
- * @gpio: the gpio number on this @gpio
|
|
|
+ * @offset: the gpio number on this @bank
|
|
|
*
|
|
|
* If a gpio is using debounce, then clear the debounce enable bit and if
|
|
|
* this is the only gpio in this bank using debounce, then clear the debounce
|
|
|
* time too. The debounce clock will also be disabled when calling this function
|
|
|
* if this is the only gpio in the bank using debounce.
|
|
|
*/
|
|
|
-static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned gpio)
|
|
|
+static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned offset)
|
|
|
{
|
|
|
- u32 gpio_bit = GPIO_BIT(bank, gpio);
|
|
|
+ u32 gpio_bit = BIT(offset);
|
|
|
|
|
|
if (!bank->dbck_flag)
|
|
|
return;
|
|
@@ -659,7 +659,7 @@ static void omap_reset_gpio(struct gpio_bank *bank, int gpio)
|
|
|
omap_set_gpio_irqenable(bank, gpio, 0);
|
|
|
omap_clear_gpio_irqstatus(bank, gpio);
|
|
|
omap_set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), IRQ_TYPE_NONE);
|
|
|
- omap_clear_gpio_debounce(bank, gpio);
|
|
|
+ omap_clear_gpio_debounce(bank, GPIO_INDEX(bank, gpio));
|
|
|
}
|
|
|
|
|
|
/* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
|