diff options
| author | Charulatha V <charu@ti.com> | 2011-05-05 17:04:12 +0530 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2011-07-14 11:53:31 -0700 |
| commit | bb91e4c882908347933576a17ef9717477402be5 (patch) | |
| tree | 48604546ec1492a9646a8acb62fa35ac1949e003 /drivers/gpio | |
| parent | fc30dc736ed5abf55aa98b7cd81ed6ae8e09e0af (diff) | |
| download | kernel_samsung_tuna-bb91e4c882908347933576a17ef9717477402be5.zip kernel_samsung_tuna-bb91e4c882908347933576a17ef9717477402be5.tar.gz kernel_samsung_tuna-bb91e4c882908347933576a17ef9717477402be5.tar.bz2 | |
GPIO: OMAP2+: Make non-wakeup GPIO part of pdata
Non-wakeup GPIOs are available only in OMAP2. Avoid cpu_is checks by making
non_wakeup_gpios as part of pdata.
Signed-off-by: Charulatha V <charu@ti.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 82e3ccc..0fb37d3 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1017,13 +1017,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) /* Initialize interface clk ungated, module enabled */ __raw_writel(0, bank->base + OMAP24XX_GPIO_CTRL); - } else if (cpu_is_omap24xx()) { - static const u32 non_wakeup_gpios[] = { - 0xe203ffc0, 0x08700040 - }; - if (bank->id < ARRAY_SIZE(non_wakeup_gpios)) - bank->non_wakeup_gpios = - non_wakeup_gpios[bank->id]; } } else if (cpu_class_is_omap1()) { if (bank_is_mpuio(bank)) { @@ -1176,6 +1169,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) bank->dbck_flag = pdata->dbck_flag; bank->stride = pdata->bank_stride; bank->width = pdata->bank_width; + bank->non_wakeup_gpios = pdata->non_wakeup_gpios; bank->loses_context = pdata->loses_context; bank->regs = pdata->regs; |