diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-05-02 18:05:44 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-20 14:37:42 -0400 |
commit | b64a02c6fa184405ac2de0ea048be2f342144a08 (patch) | |
tree | 710f1c477a67b63eac0399d4667b1d5fe9bdf82d /arch/arm/mach-tegra/board-paz00.c | |
parent | a12c0efc7a3f433377add0fa1fd0ed4836cc595e (diff) |
ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
There currently aren't bindings for a WiFi rfkill button, and defining
a good binding is non-trivial. Manually register this "device" when
booting from device tree, in order to bring DT support to the same
feature level as board files, which will in turn allow board files to be
deprecated.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-paz00.c')
-rw-r--r-- | arch/arm/mach-tegra/board-paz00.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index bbc1907e98a6..4b64af5cab27 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c | |||
@@ -148,7 +148,6 @@ static struct platform_device *paz00_devices[] __initdata = { | |||
148 | &debug_uart, | 148 | &debug_uart, |
149 | &tegra_sdhci_device4, | 149 | &tegra_sdhci_device4, |
150 | &tegra_sdhci_device1, | 150 | &tegra_sdhci_device1, |
151 | &wifi_rfkill_device, | ||
152 | &leds_gpio, | 151 | &leds_gpio, |
153 | &gpio_keys_device, | 152 | &gpio_keys_device, |
154 | }; | 153 | }; |
@@ -201,6 +200,11 @@ static struct tegra_sdhci_platform_data sdhci_pdata4 = { | |||
201 | .is_8bit = 1, | 200 | .is_8bit = 1, |
202 | }; | 201 | }; |
203 | 202 | ||
203 | void __init tegra_paz00_wifikill_init(void) | ||
204 | { | ||
205 | platform_device_register(&wifi_rfkill_device); | ||
206 | } | ||
207 | |||
204 | static void __init tegra_paz00_init(void) | 208 | static void __init tegra_paz00_init(void) |
205 | { | 209 | { |
206 | tegra_clk_init_from_table(paz00_clk_init_table); | 210 | tegra_clk_init_from_table(paz00_clk_init_table); |
@@ -211,6 +215,7 @@ static void __init tegra_paz00_init(void) | |||
211 | tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4; | 215 | tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4; |
212 | 216 | ||
213 | platform_add_devices(paz00_devices, ARRAY_SIZE(paz00_devices)); | 217 | platform_add_devices(paz00_devices, ARRAY_SIZE(paz00_devices)); |
218 | tegra_paz00_wifikill_init(); | ||
214 | 219 | ||
215 | paz00_i2c_init(); | 220 | paz00_i2c_init(); |
216 | paz00_usb_init(); | 221 | paz00_usb_init(); |