diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /drivers/gpio/gpio-omap.c | |
| parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
| parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) | |
| download | linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.bz2 | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 0b0562979171..5b7b164e08ad 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1064,13 +1064,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank, int id) + OMAP1610_GPIO_IRQSTATUS1); __raw_writew(0x0014, bank->base + OMAP1610_GPIO_SYSCONFIG); - - /* - * Enable system clock for GPIO module. - * The CAM_CLK_CTRL *is* really the right place. - */ - omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04, - ULPD_CAM_CLK_CTRL); } if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_7XX) { __raw_writel(0xffffffff, bank->base |