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

A single patch to restore rfkill support on AC100.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWJjTwAAoJEN0jrNd/PrOhZoAP/RProYcLUmaeegpue3lnEUVe
 Zl1RnuuDX0y/LKshB+eRm2TYJo5ihPqkRXigcWqbN6Z03dgXhMql3gU/bllt6eDq
 7PjT8znRbmqfapKlMHgQAoaM0ZhbkczNHDK9exITx98twxqy2+hhgUocIbQnZE4A
 VtS8bPzfBt623lqbynhHPYtZcZSInMxoL3gefzneQ/Hb80Ys6dkhP8pmn3JZsElB
 rRgNKmFddNmLVRxNCZ0HUPPK6+WyBC/tzVy2yMGzQufzmELxwjgnzk5/f0gjf9oJ
 oB0yedgOfrENEN75rUxfgwcNXyg6et3GoNdzQ69pBPZoi7ODD6lu8lDb6hEXbfdV
 imt0Wcplf6J4KdQcxnEuY9pluM7nJGVEiA75RC+fJt8jUS5LIgguc6Aj/lkeOEGw
 U7oWbHGzi6K1gIZKXQuGw/2alTJ3XFTZmBROndsaGzvdD2GKKSsUHOGng6tAYaV2
 S1VapoPZY62V51hW02ujF/5F3s4Iuu/Ysi9lF6aplX1RZmk0Oo4GR40JgYSSkH8u
 kk3YISVNA15EusbSOU9zSBNvwWeNDYzadiKoS5llTPB27IhL7avvAZWTEhOjGrr5
 AMndFT0ihTOwIoBNx+P2t+Hk5cwcNBlw57MSiQUlLvBIPDzS2Xc6kb8medaMfTcR
 j++5q15wBgxfiAAQ1MRM
 =5xhD
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2015-10-26 09:45:56 +09:00

View File

@ -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),
{ },
},
};