mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
bcd9f26694
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.83 Manually rebased: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch generic/pending-6.1/737-07-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From d64c732dfc9edcd57feb693c23162117737e426b Mon Sep 17 00:00:00 2001
|
|
From: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Date: Mon, 2 Jan 2023 18:29:34 +0100
|
|
Subject: [PATCH] net: rfkill: gpio: add DT support
|
|
|
|
Allow probing rfkill-gpio via device tree. This hooks up the already
|
|
existing support that was started in commit 262c91ee5e52 ("net:
|
|
rfkill: gpio: prepare for DT and ACPI support") via the "rfkill-gpio"
|
|
compatible, with the "name" and "type" properties renamed to "label"
|
|
and "radio-type", respectively, in the device tree case.
|
|
|
|
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Link: https://lore.kernel.org/r/20230102-rfkill-gpio-dt-v2-2-d1b83758c16d@pengutronix.de
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
net/rfkill/rfkill-gpio.c | 20 ++++++++++++++++++--
|
|
1 file changed, 18 insertions(+), 2 deletions(-)
|
|
|
|
--- a/net/rfkill/rfkill-gpio.c
|
|
+++ b/net/rfkill/rfkill-gpio.c
|
|
@@ -75,6 +75,8 @@ static int rfkill_gpio_probe(struct plat
|
|
{
|
|
struct rfkill_gpio_data *rfkill;
|
|
struct gpio_desc *gpio;
|
|
+ const char *name_property;
|
|
+ const char *type_property;
|
|
const char *type_name;
|
|
int ret;
|
|
|
|
@@ -82,8 +84,15 @@ static int rfkill_gpio_probe(struct plat
|
|
if (!rfkill)
|
|
return -ENOMEM;
|
|
|
|
- device_property_read_string(&pdev->dev, "name", &rfkill->name);
|
|
- device_property_read_string(&pdev->dev, "type", &type_name);
|
|
+ if (dev_of_node(&pdev->dev)) {
|
|
+ name_property = "label";
|
|
+ type_property = "radio-type";
|
|
+ } else {
|
|
+ name_property = "name";
|
|
+ type_property = "type";
|
|
+ }
|
|
+ device_property_read_string(&pdev->dev, name_property, &rfkill->name);
|
|
+ device_property_read_string(&pdev->dev, type_property, &type_name);
|
|
|
|
if (!rfkill->name)
|
|
rfkill->name = dev_name(&pdev->dev);
|
|
@@ -165,12 +174,19 @@ static const struct acpi_device_id rfkil
|
|
MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match);
|
|
#endif
|
|
|
|
+static const struct of_device_id rfkill_of_match[] __maybe_unused = {
|
|
+ { .compatible = "rfkill-gpio", },
|
|
+ { },
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, rfkill_of_match);
|
|
+
|
|
static struct platform_driver rfkill_gpio_driver = {
|
|
.probe = rfkill_gpio_probe,
|
|
.remove = rfkill_gpio_remove,
|
|
.driver = {
|
|
.name = "rfkill_gpio",
|
|
.acpi_match_table = ACPI_PTR(rfkill_acpi_match),
|
|
+ .of_match_table = of_match_ptr(rfkill_of_match),
|
|
},
|
|
};
|
|
|