Commit ce74a6c6 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Thierry Reding
Browse files

ARM: tegra: paz00: Configure WiFi rfkill switch through device tree 



As of d64c732d ("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: default avatarMarc Dietrich <marvin24@gmx.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 464aac3a

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

+8 −0
Original line number Diff line number Diff line
@@ -706,6 +706,14 @@ vdd_pnl_reg: regulator-3v0 { 
		enable-active-high;

	};



	rfkill {

		compatible = "rfkill-gpio";

		label = "wifi_rfkill";

		radio-type = "wlan";

		reset-gpios = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;

		shutdown-gpios = <&gpio TEGRA_GPIO(K, 5) GPIO_ACTIVE_HIGH>;

	};



	sound {

		compatible = "nvidia,tegra-audio-alc5632-paz00",

			"nvidia,tegra-audio-alc5632";

arch/arm/mach-tegra/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -15,5 +15,3 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 


obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= pm-tegra30.o

obj-$(CONFIG_ARCH_TEGRA_124_SOC)	+= pm-tegra30.o
 


obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-paz00.o

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

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 *

 * Copyright (C) 2011 Marc Dietrich <marvin24@gmx.de>

 *

 * Based on board-harmony.c

 * Copyright (C) 2010 Google, Inc.

 */



#include <linux/err.h>

#include <linux/gpio/machine.h>

#include <linux/gpio/property.h>

#include <linux/platform_device.h>

#include <linux/printk.h>

#include <linux/property.h>



#include "board.h"



static const struct software_node tegra_gpiochip_node = {

	.name	= "tegra-gpio",

};



static const struct property_entry wifi_rfkill_prop[] __initconst = {

	PROPERTY_ENTRY_STRING("name", "wifi_rfkill"),

	PROPERTY_ENTRY_STRING("type", "wlan"),

	PROPERTY_ENTRY_GPIO("reset-gpios",

			    &tegra_gpiochip_node, 25, GPIO_ACTIVE_HIGH),

	PROPERTY_ENTRY_GPIO("shutdown-gpios",

			    &tegra_gpiochip_node, 85, GPIO_ACTIVE_HIGH),

	{ }

};



static const struct platform_device_info wifi_rfkill_info __initconst = {

	.name		= "rfkill_gpio",

	.id		= PLATFORM_DEVID_NONE,

	.properties	= wifi_rfkill_prop,

};



void __init tegra_paz00_wifikill_init(void)

{

	struct platform_device *pd;

	int err;



	err = software_node_register(&tegra_gpiochip_node);

	if (err) {

		pr_err("failed to register %s node: %d\n",

		       tegra_gpiochip_node.name, err);

		return;

	}



	pd = platform_device_register_full(&wifi_rfkill_info);

	err = PTR_ERR_OR_ZERO(pd);

	if (err)

		pr_err("failed to register WiFi rfkill device: %d\n", err);

}

arch/arm/mach-tegra/board.h

+0 −2
Original line number Diff line number Diff line
@@ -19,6 +19,4 @@ 
void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);



void __init tegra_paz00_wifikill_init(void);



#endif

arch/arm/mach-tegra/tegra.c

+0 −4
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ static void __init tegra_dt_init(void) 


static void __init tegra_dt_init_late(void)

{

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&

	    of_machine_is_compatible("compal,paz00"))

		tegra_paz00_wifikill_init();



	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&

	    of_machine_is_compatible("nvidia,tegra20"))

		platform_device_register_simple("tegra20-cpufreq", -1, NULL, 0);