| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Sekhar Nori <nsekhar@ti.com> |
| Date: Tue, 24 Apr 2018 20:05:06 +0530 |
| Subject: ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup |
| |
| From: Sekhar Nori <nsekhar@ti.com> |
| |
| [ Upstream commit d45622c0eaa5992a1a2248cbe93e1ff7a2da7be4 ] |
| |
| commit c4dc56be7e26 ("ARM: davinci: fix the GPIO lookup for omapl138-hawk") |
| fixed the GPIO chip name for look-up of MMC/SD CD and WP pins, but forgot |
| to change the GPIO numbers passed. |
| |
| The GPIO numbers are not offsets from within a 32 GPIO bank. Fix the |
| GPIO numbers as well as remove the misleading comment. |
| |
| Fixes: c4dc56be7e26 ("ARM: davinci: fix the GPIO lookup for omapl138-hawk") |
| Reviewed-by: David Lechner <david@lechnology.com> |
| Signed-off-by: Sekhar Nori <nsekhar@ti.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mach-davinci/board-omapl138-hawk.c | 10 +++++++--- |
| 1 file changed, 7 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/mach-davinci/board-omapl138-hawk.c |
| +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c |
| @@ -123,12 +123,16 @@ static const short hawk_mmcsd0_pins[] = |
| -1 |
| }; |
| |
| +#define DA850_HAWK_MMCSD_CD_PIN GPIO_TO_PIN(3, 12) |
| +#define DA850_HAWK_MMCSD_WP_PIN GPIO_TO_PIN(3, 13) |
| + |
| 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.0", 28, "cd", GPIO_ACTIVE_LOW), |
| - GPIO_LOOKUP("davinci_gpio.0", 29, "wp", GPIO_ACTIVE_LOW), |
| + GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_CD_PIN, "cd", |
| + GPIO_ACTIVE_LOW), |
| + GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_WP_PIN, "wp", |
| + GPIO_ACTIVE_LOW), |
| }, |
| }; |
| |