Unverified Commit 696a2af2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.11-arm-core' of... 

Merge tag 'tegra-for-6.11-arm-core' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/arm

ARM: tegra: Core changes for v6.11-rc1

Uses software nodes to describe rfkill instead of using a GPIO lookup
table.

* tag 'tegra-for-6.11-arm-core' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: paz00: Use software nodes to describe GPIOs for WiFi rfkill

Link: https://lore.kernel.org/r/20240628210818.3627404-2-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c03088be 237c5c95

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

+32 −18
Original line number Diff line number Diff line
@@ -8,35 +8,49 @@ 
 * Copyright (C) 2010 Google, Inc.

 */



#include <linux/property.h>

#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 struct property_entry wifi_rfkill_prop[] __initdata = {

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 struct platform_device wifi_rfkill_device = {

static const struct platform_device_info wifi_rfkill_info __initconst = {

	.name		= "rfkill_gpio",

	.id	= -1,

};



static struct gpiod_lookup_table wifi_gpio_lookup = {

	.dev_id = "rfkill_gpio",

	.table = {

		GPIO_LOOKUP("tegra-gpio", 25, "reset", 0),

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

		{ },

	},

	.id		= PLATFORM_DEVID_NONE,

	.properties	= wifi_rfkill_prop,

};



void __init tegra_paz00_wifikill_init(void)

{

	device_create_managed_software_node(&wifi_rfkill_device.dev, wifi_rfkill_prop, NULL);

	gpiod_add_lookup_table(&wifi_gpio_lookup);

	platform_device_register(&wifi_rfkill_device);

	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);

}