Commit e77b675f authored Jun 30, 2015 by Dmitry Osipenko Committed by Thierry Reding Oct 02, 2015

ARM: tegra: paz00: use con_id's to refer GPIO's in gpiod_lookup table



Commit 72daceb9 ("net: rfkill: gpio: Add default GPIO driver mappings
for ACPI") removed possibility to request GPIO by table index for non-ACPI
platforms without changing its 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
making gpiod_lookup_table use con_id's instead of indexes.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Fixes: 72daceb9 (net: rfkill: gpio: Add default GPIO driver mappings for ACPI)
Cc: <stable@vger.kernel.org> # v3.19+
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Marc Dietrich <marvin24@gmx.de>
Tested-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>

parent 6ff33f39

arch/arm/mach-tegra/board-paz00.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,8 @@ static struct platform_device wifi_rfkill_device = {
	static struct gpiod_lookup_table wifi_gpio_lookup = {		static struct gpiod_lookup_table wifi_gpio_lookup = {
	.dev_id = "rfkill_gpio",		.dev_id = "rfkill_gpio",
	.table = {		.table = {
	GPIO_LOOKUP_IDX("tegra-gpio", 25, NULL, 0, 0),		GPIO_LOOKUP("tegra-gpio", 25, "reset", 0),
	GPIO_LOOKUP_IDX("tegra-gpio", 85, NULL, 1, 0),		GPIO_LOOKUP("tegra-gpio", 85, "shutdown", 0),
	{ },		{ },
	},		},
	};		};