diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/gpio.c | 8 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/gpio.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 4877b525def3..ae5043eaba82 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c | |||
@@ -90,6 +90,10 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
90 | pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN; | 90 | pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN; |
91 | pdata->regs->ctrl = OMAP24XX_GPIO_CTRL; | 91 | pdata->regs->ctrl = OMAP24XX_GPIO_CTRL; |
92 | pdata->regs->wkup_en = OMAP24XX_GPIO_WAKE_EN; | 92 | pdata->regs->wkup_en = OMAP24XX_GPIO_WAKE_EN; |
93 | pdata->regs->leveldetect0 = OMAP24XX_GPIO_LEVELDETECT0; | ||
94 | pdata->regs->leveldetect1 = OMAP24XX_GPIO_LEVELDETECT1; | ||
95 | pdata->regs->risingdetect = OMAP24XX_GPIO_RISINGDETECT; | ||
96 | pdata->regs->fallingdetect = OMAP24XX_GPIO_FALLINGDETECT; | ||
93 | break; | 97 | break; |
94 | case 2: | 98 | case 2: |
95 | pdata->bank_type = METHOD_GPIO_44XX; | 99 | pdata->bank_type = METHOD_GPIO_44XX; |
@@ -108,6 +112,10 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
108 | pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE; | 112 | pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE; |
109 | pdata->regs->ctrl = OMAP4_GPIO_CTRL; | 113 | pdata->regs->ctrl = OMAP4_GPIO_CTRL; |
110 | pdata->regs->wkup_en = OMAP4_GPIO_IRQWAKEN0; | 114 | pdata->regs->wkup_en = OMAP4_GPIO_IRQWAKEN0; |
115 | pdata->regs->leveldetect0 = OMAP4_GPIO_LEVELDETECT0; | ||
116 | pdata->regs->leveldetect1 = OMAP4_GPIO_LEVELDETECT1; | ||
117 | pdata->regs->risingdetect = OMAP4_GPIO_RISINGDETECT; | ||
118 | pdata->regs->fallingdetect = OMAP4_GPIO_FALLINGDETECT; | ||
111 | break; | 119 | break; |
112 | default: | 120 | default: |
113 | WARN(1, "Invalid gpio bank_type\n"); | 121 | WARN(1, "Invalid gpio bank_type\n"); |
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index 2b54bca511d7..395b3c1e8ba4 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h | |||
@@ -190,6 +190,10 @@ struct omap_gpio_reg_offs { | |||
190 | u16 debounce_en; | 190 | u16 debounce_en; |
191 | u16 ctrl; | 191 | u16 ctrl; |
192 | u16 wkup_en; | 192 | u16 wkup_en; |
193 | u16 leveldetect0; | ||
194 | u16 leveldetect1; | ||
195 | u16 risingdetect; | ||
196 | u16 fallingdetect; | ||
193 | 197 | ||
194 | bool irqenable_inv; | 198 | bool irqenable_inv; |
195 | }; | 199 | }; |