| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Sekhar Nori <nsekhar@ti.com> |
| Date: Tue, 24 Apr 2018 20:05:04 +0530 |
| Subject: ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD |
| |
| From: Sekhar Nori <nsekhar@ti.com> |
| |
| [ Upstream commit 67c6b6ff221f807180aea6dd597246f87e1dd98a ] |
| |
| The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that |
| mmc can correctly lookup the wp and cp gpios. Also fix the GPIO numbers |
| as they are not offsets within a bank. |
| |
| Note that it is the gpio-davinci driver that sets the gpiochip label to |
| davinci_gpio.0. |
| |
| Fixes: bdf0e8364fd3 ("ARM: davinci: da850-evm: use gpio descriptor for mmc pins") |
| 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-da850-evm.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/mach-davinci/board-da850-evm.c |
| +++ b/arch/arm/mach-davinci/board-da850-evm.c |
| @@ -763,12 +763,17 @@ static const short da850_evm_mcasp_pins[ |
| -1 |
| }; |
| |
| +#define DA850_MMCSD_CD_PIN GPIO_TO_PIN(4, 0) |
| +#define DA850_MMCSD_WP_PIN GPIO_TO_PIN(4, 1) |
| + |
| static struct gpiod_lookup_table mmc_gpios_table = { |
| .dev_id = "da830-mmc.0", |
| .table = { |
| /* gpio chip 2 contains gpio range 64-95 */ |
| - GPIO_LOOKUP("davinci_gpio.2", 0, "cd", GPIO_ACTIVE_LOW), |
| - GPIO_LOOKUP("davinci_gpio.2", 1, "wp", GPIO_ACTIVE_LOW), |
| + GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd", |
| + GPIO_ACTIVE_LOW), |
| + GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp", |
| + GPIO_ACTIVE_LOW), |
| }, |
| }; |
| |
