Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c2b3d3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-4.4-soc' of... 

Merge tag 'tegra-for-4.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

ARM: tegra: Core SoC changes for v4.4-rc1

A single patch to restore rfkill support on AC100.

* tag 'tegra-for-4.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 44024ce0 e77b675f

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

+2 −2
Original line number Diff line number Diff line
@@ -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("tegra-gpio", 25, "reset", 0),

		GPIO_LOOKUP("tegra-gpio", 85, "shutdown", 0),

		{ },

	},

};