Message ID | 20190319201952.1309-1-jmkrzyszt@gmail.com (mailing list archive) |
---|---|
State | Mainlined, archived |
Commit | 3e2cf62efec52fb49daed437cc486c3cb9a0afa2 |
Headers | show |
Series | ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation | expand |
On Tue, Mar 19, 2019 at 09:19:52PM +0100, Janusz Krzysztofik wrote: > In order to request dynamic allocationn of GPIO IDs, a negative number > should be passed as a base GPIO ID via platform data. Unfortuntely, > commit 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global > GPIO numbers") didn't follow that rule while switching to dynamically > allocated GPIO IDs for Amstrad Delta latches, making their IDs > overlapping with those already assigned to OMAP GPIO devices. Fix it. > > Fixes: 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers") > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> > Cc: stable@vger.kernel.org Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> A.
* Aaro Koskinen <aaro.koskinen@iki.fi> [190320 01:02]: > On Tue, Mar 19, 2019 at 09:19:52PM +0100, Janusz Krzysztofik wrote: > > In order to request dynamic allocationn of GPIO IDs, a negative number > > should be passed as a base GPIO ID via platform data. Unfortuntely, > > commit 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global > > GPIO numbers") didn't follow that rule while switching to dynamically > > allocated GPIO IDs for Amstrad Delta latches, making their IDs > > overlapping with those already assigned to OMAP GPIO devices. Fix it. > > > > Fixes: 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers") > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> > > Cc: stable@vger.kernel.org > > Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> Applying into omap-for-v5.1/fixes thanks. Tony
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index be30c3c061b4..1b15d593837e 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -182,6 +182,7 @@ static struct resource latch1_resources[] = { static struct bgpio_pdata latch1_pdata = { .label = LATCH1_LABEL, + .base = -1, .ngpio = LATCH1_NGPIO, }; @@ -219,6 +220,7 @@ static struct resource latch2_resources[] = { static struct bgpio_pdata latch2_pdata = { .label = LATCH2_LABEL, + .base = -1, .ngpio = LATCH2_NGPIO, };
In order to request dynamic allocationn of GPIO IDs, a negative number should be passed as a base GPIO ID via platform data. Unfortuntely, commit 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers") didn't follow that rule while switching to dynamically allocated GPIO IDs for Amstrad Delta latches, making their IDs overlapping with those already assigned to OMAP GPIO devices. Fix it. Fixes: 771e53c4d1a1 ("ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers") Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: stable@vger.kernel.org --- arch/arm/mach-omap1/board-ams-delta.c | 2 ++ 1 file changed, 2 insertions(+)