Skip to content

Commit ce74a6c

Browse files
dtorthierryreding
authored andcommitted
ARM: tegra: paz00: Configure WiFi rfkill switch through device tree
As of d64c732 ("net: rfkill: gpio: add DT support") rfkill-gpio device can be instantiated via device tree. Add the declaration there and drop board-paz00.c file and relevant Makefile fragments. Tested-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 464aac3 commit ce74a6c

5 files changed

Lines changed: 8 additions & 64 deletions

File tree

arch/arm/boot/dts/nvidia/tegra20-paz00.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,14 @@
706706
enable-active-high;
707707
};
708708

709+
rfkill {
710+
compatible = "rfkill-gpio";
711+
label = "wifi_rfkill";
712+
radio-type = "wlan";
713+
reset-gpios = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
714+
shutdown-gpios = <&gpio TEGRA_GPIO(K, 5) GPIO_ACTIVE_HIGH>;
715+
};
716+
709717
sound {
710718
compatible = "nvidia,tegra-audio-alc5632-paz00",
711719
"nvidia,tegra-audio-alc5632";

arch/arm/mach-tegra/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
1515

1616
obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o
1717
obj-$(CONFIG_ARCH_TEGRA_124_SOC) += pm-tegra30.o
18-
19-
obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

arch/arm/mach-tegra/board.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@
1919
void __init tegra_map_common_io(void);
2020
void __init tegra_init_irq(void);
2121

22-
void __init tegra_paz00_wifikill_init(void);
23-
2422
#endif

arch/arm/mach-tegra/tegra.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ static void __init tegra_dt_init(void)
8383

8484
static void __init tegra_dt_init_late(void)
8585
{
86-
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
87-
of_machine_is_compatible("compal,paz00"))
88-
tegra_paz00_wifikill_init();
89-
9086
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
9187
of_machine_is_compatible("nvidia,tegra20"))
9288
platform_device_register_simple("tegra20-cpufreq", -1, NULL, 0);

0 commit comments

Comments
 (0)