| From 558c49b63bd404c94ae81733d0cae4ea26db4ed1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Feb 2024 20:14:35 +0200 |
| Subject: ARM: OMAP2+: fix bogus MMC GPIO labels on Nokia N8x0 |
| |
| From: Aaro Koskinen <aaro.koskinen@iki.fi> |
| |
| [ Upstream commit 95f37eb52e18879a1b16e51b972d992b39e50a81 ] |
| |
| The GPIO bank width is 32 on OMAP2, so all labels are incorrect. |
| |
| Fixes: e519f0bb64ef ("ARM/mmc: Convert old mmci-omap to GPIO descriptors") |
| Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Message-ID: <20240223181439.1099750-2-aaro.koskinen@iki.fi> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| Acked-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/mach-omap2/board-n8x0.c | 9 +++------ |
| 1 file changed, 3 insertions(+), 6 deletions(-) |
| |
| diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c |
| index 31755a378c736..3e48f34016c19 100644 |
| --- a/arch/arm/mach-omap2/board-n8x0.c |
| +++ b/arch/arm/mach-omap2/board-n8x0.c |
| @@ -144,8 +144,7 @@ static struct gpiod_lookup_table nokia8xx_mmc_gpio_table = { |
| .dev_id = "mmci-omap.0", |
| .table = { |
| /* Slot switch, GPIO 96 */ |
| - GPIO_LOOKUP("gpio-80-111", 16, |
| - "switch", GPIO_ACTIVE_HIGH), |
| + GPIO_LOOKUP("gpio-96-127", 0, "switch", GPIO_ACTIVE_HIGH), |
| { } |
| }, |
| }; |
| @@ -154,11 +153,9 @@ static struct gpiod_lookup_table nokia810_mmc_gpio_table = { |
| .dev_id = "mmci-omap.0", |
| .table = { |
| /* Slot index 1, VSD power, GPIO 23 */ |
| - GPIO_LOOKUP_IDX("gpio-16-31", 7, |
| - "vsd", 1, GPIO_ACTIVE_HIGH), |
| + GPIO_LOOKUP_IDX("gpio-0-31", 23, "vsd", 1, GPIO_ACTIVE_HIGH), |
| /* Slot index 1, VIO power, GPIO 9 */ |
| - GPIO_LOOKUP_IDX("gpio-0-15", 9, |
| - "vio", 1, GPIO_ACTIVE_HIGH), |
| + GPIO_LOOKUP_IDX("gpio-0-31", 9, "vio", 1, GPIO_ACTIVE_HIGH), |
| { } |
| }, |
| }; |
| -- |
| 2.43.0 |
| |
