diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:19:05 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 11:20:07 -0400 |
commit | f4e2467bad53023589cbff18dd1ab6e0aa3f004c (patch) | |
tree | 8d7abbf418eabd25bbcdc9b6de2f8216d2eaa616 /drivers/gpio | |
parent | e3643b77de143c5548ec93abd8aa68f4123295ea (diff) | |
parent | a6de3df4f172e124280d88e617ee7d29f7af970b (diff) |
Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
ep93xx: Remove unnecessary includes of ep93xx-regs.h
ep93xx: Move EP93XX_SYSCON defines to SoC private header
ep93xx: Move crunch code to mach-ep93xx directory
ep93xx: Make syscon access functions private to SoC
ep93xx: Configure GPIO ports in core code
ep93xx: Move peripheral defines to local SoC header
ep93xx: Convert the watchdog driver into a platform device.
ep93xx: Use ioremap for backlight driver
ep93xx: Move GPIO defines to gpio-ep93xx.h
ep93xx: Don't use system controller defines in audio drivers
ep93xx: Move PHYS_BASE defines to local SoC header file
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-s3c2440/common.h
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-ep93xx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 1c0fc3756cb1..4ca5642e9776 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c | |||
@@ -378,13 +378,6 @@ static int __devinit ep93xx_gpio_probe(struct platform_device *pdev) | |||
378 | } | 378 | } |
379 | ep93xx_gpio->mmio_base = mmio; | 379 | ep93xx_gpio->mmio_base = mmio; |
380 | 380 | ||
381 | /* Default all ports to GPIO */ | ||
382 | ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_KEYS | | ||
383 | EP93XX_SYSCON_DEVCFG_GONK | | ||
384 | EP93XX_SYSCON_DEVCFG_EONIDE | | ||
385 | EP93XX_SYSCON_DEVCFG_GONIDE | | ||
386 | EP93XX_SYSCON_DEVCFG_HONIDE); | ||
387 | |||
388 | for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) { | 381 | for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) { |
389 | struct bgpio_chip *bgc = &ep93xx_gpio->bgc[i]; | 382 | struct bgpio_chip *bgc = &ep93xx_gpio->bgc[i]; |
390 | struct ep93xx_gpio_bank *bank = &ep93xx_gpio_banks[i]; | 383 | struct ep93xx_gpio_bank *bank = &ep93xx_gpio_banks[i]; |