| Message ID | 1435520160-16862-1-git-send-email-digetx@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 29, 2015 at 4:34 AM, Dmitry Osipenko <digetx@gmail.com> wrote: > Commit 72daceb9a10a ("net: rfkill: gpio: Add default GPIO driver mappings > for ACPI") removed possibility to request GPIO by table index for non-ACPI > platforms without changing it users. As result "shutdown" GPIO request > will fail if request for "reset" GPIO succeeded or "reset" will be > requested instead of "shutdown" if "reset" wasn't defined. Fix it by > setting conn_id's in gpiod_lookup_table. Yep, and using con_ids is a good idea anyway. Acked-by: Alexandre Courbot <acourbot@nvidia.com> > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > Fixes: 72daceb (net: rfkill: gpio: Add default GPIO driver mappings for ACPI) > Cc: <stable@vger.kernel.org> # v3.19+ > --- > arch/arm/mach-tegra/board-paz00.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c > index fbe74c6..67024f3 100644 > --- a/arch/arm/mach-tegra/board-paz00.c > +++ b/arch/arm/mach-tegra/board-paz00.c > @@ -39,8 +39,8 @@ static struct platform_device wifi_rfkill_device = { > static struct gpiod_lookup_table wifi_gpio_lookup = { > .dev_id = "rfkill_gpio", > .table = { > - GPIO_LOOKUP_IDX("tegra-gpio", 25, NULL, 0, 0), > - GPIO_LOOKUP_IDX("tegra-gpio", 85, NULL, 1, 0), > + GPIO_LOOKUP_IDX("tegra-gpio", 25, "reset", 0, 0), > + GPIO_LOOKUP_IDX("tegra-gpio", 85, "shutdown", 1, 0), > { }, > }, > }; > -- > 2.4.4 >
30.06.2015 16:42, Alexandre Courbot ?????: > On Mon, Jun 29, 2015 at 4:34 AM, Dmitry Osipenko <digetx@gmail.com> wrote: >> Commit 72daceb9a10a ("net: rfkill: gpio: Add default GPIO driver mappings >> for ACPI") removed possibility to request GPIO by table index for non-ACPI >> platforms without changing it users. As result "shutdown" GPIO request >> will fail if request for "reset" GPIO succeeded or "reset" will be >> requested instead of "shutdown" if "reset" wasn't defined. Fix it by >> setting conn_id's in gpiod_lookup_table. > > Yep, and using con_ids is a good idea anyway. > > Acked-by: Alexandre Courbot <acourbot@nvidia.com> > After discussion on irc, turned out that patch missed s/GPIO_LOOKUP_IDX/GPIO_LOOKUP. I'll send V2. And s/conn_id/con_id typo started to annoy me...
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index fbe74c6..67024f3 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -39,8 +39,8 @@ static struct platform_device wifi_rfkill_device = { static struct gpiod_lookup_table wifi_gpio_lookup = { .dev_id = "rfkill_gpio", .table = { - GPIO_LOOKUP_IDX("tegra-gpio", 25, NULL, 0, 0), - GPIO_LOOKUP_IDX("tegra-gpio", 85, NULL, 1, 0), + GPIO_LOOKUP_IDX("tegra-gpio", 25, "reset", 0, 0), + GPIO_LOOKUP_IDX("tegra-gpio", 85, "shutdown", 1, 0), { }, }, };
Commit 72daceb9a10a ("net: rfkill: gpio: Add default GPIO driver mappings for ACPI") removed possibility to request GPIO by table index for non-ACPI platforms without changing it users. As result "shutdown" GPIO request will fail if request for "reset" GPIO succeeded or "reset" will be requested instead of "shutdown" if "reset" wasn't defined. Fix it by setting conn_id's in gpiod_lookup_table. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Fixes: 72daceb (net: rfkill: gpio: Add default GPIO driver mappings for ACPI) Cc: <stable@vger.kernel.org> # v3.19+ --- arch/arm/mach-tegra/board-paz00.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)