diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:30:43 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 15:30:43 +0100 |
commit | 3a5d470d076a5ebc6563601daa4867b2e84832e8 (patch) | |
tree | bf57e8fbc477446720f55cca6cf9fb1c61520c12 /arch | |
parent | 314700625873d0aec520a739861ea91d8ebbe986 (diff) | |
parent | c4dc56be7e26040bfc60ce73425353516a356955 (diff) | |
download | linux-stable-3a5d470d076a5ebc6563601daa4867b2e84832e8.tar.gz linux-stable-3a5d470d076a5ebc6563601daa4867b2e84832e8.tar.bz2 linux-stable-3a5d470d076a5ebc6563601daa4867b2e84832e8.zip |
Merge tag 'davinci-fixes-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
Pull "DaVinci fixes for v4.16" from Sekhar Nori:
A patch fixing GPIO look-up for MMC/SD card detect and write-protect
pins on OMAP-L138 Hawkboard.
* tag 'davinci-fixes-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix the GPIO lookup for omapl138-hawk
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index a3e78074be70..62eb7d668890 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -127,8 +127,8 @@ static struct gpiod_lookup_table mmc_gpios_table = { .dev_id = "da830-mmc.0", .table = { /* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/ - GPIO_LOOKUP("davinci_gpio.1", 28, "cd", GPIO_ACTIVE_LOW), - GPIO_LOOKUP("davinci_gpio.1", 29, "wp", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("davinci_gpio.0", 28, "cd", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("davinci_gpio.0", 29, "wp", GPIO_ACTIVE_LOW), }, }; |