* [PATCH leds v2 0/2] leds: ns2: convert to fwnode API
@ 2020-09-26 20:11 Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 1/2] " Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr Marek Behún
0 siblings, 2 replies; 4+ messages in thread
From: Marek Behún @ 2020-09-26 20:11 UTC (permalink / raw)
To: linux-leds; +Cc: Pavel Machek, dmurphy, Marek Behún
Hi Pavel,
Simon wants to bind this driver without device-tree, so this changes
the binding from specific OF API to generic fwnode API.
This applies to your for-next and Simon tested this on a d2 Network
board.
Marek
Marek Behún (2):
leds: ns2: convert to fwnode API
leds: ns2: do not guard OF match pointer with of_match_ptr
drivers/leds/leds-ns2.c | 69 ++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 36 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH leds v2 1/2] leds: ns2: convert to fwnode API
2020-09-26 20:11 [PATCH leds v2 0/2] leds: ns2: convert to fwnode API Marek Behún
@ 2020-09-26 20:11 ` Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr Marek Behún
1 sibling, 0 replies; 4+ messages in thread
From: Marek Behún @ 2020-09-26 20:11 UTC (permalink / raw)
To: linux-leds; +Cc: Pavel Machek, dmurphy, Marek Behún, Simon Guinot
Convert from OF api to fwnode API, so that it is possible to bind this
driver without device-tree.
The fwnode API does not expose a function to read a specific element of
an array. We therefore change the types of the ns2_led_modval structure
so that we can read the whole modval array with one fwnode call.
Signed-off-by: Marek Behún <kabel@kernel.org>
Tested-by: Simon Guinot <simon.guinot@sequanux.org>
---
drivers/leds/leds-ns2.c | 55 +++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index e1ec5cbed07e..dba6bdfa861b 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -24,11 +24,16 @@ enum ns2_led_modes {
NS_V2_LED_SATA,
};
+/*
+ * If the size of this structure or types of its members is changed,
+ * the filling of array modval in function ns2_led_register must be changed
+ * accordingly.
+ */
struct ns2_led_modval {
- enum ns2_led_modes mode;
- int cmd_level;
- int slow_level;
-};
+ u32 mode;
+ u32 cmd_level;
+ u32 slow_level;
+} __packed;
/*
* The Network Space v2 dual-GPIO LED is wired to a CPLD. Three different LED
@@ -167,27 +172,28 @@ static struct attribute *ns2_led_attrs[] = {
};
ATTRIBUTE_GROUPS(ns2_led);
-static int ns2_led_register(struct device *dev, struct device_node *np,
+static int ns2_led_register(struct device *dev, struct fwnode_handle *node,
struct ns2_led *led)
{
struct led_init_data init_data = {};
struct ns2_led_modval *modval;
enum ns2_led_modes mode;
- int nmodes, ret, i;
+ int nmodes, ret;
- led->cmd = devm_gpiod_get_from_of_node(dev, np, "cmd-gpio", 0,
- GPIOD_ASIS, np->name);
+ led->cmd = devm_fwnode_gpiod_get_index(dev, node, "cmd", 0, GPIOD_ASIS,
+ fwnode_get_name(node));
if (IS_ERR(led->cmd))
return PTR_ERR(led->cmd);
- led->slow = devm_gpiod_get_from_of_node(dev, np, "slow-gpio", 0,
- GPIOD_ASIS, np->name);
+ led->slow = devm_fwnode_gpiod_get_index(dev, node, "slow", 0,
+ GPIOD_ASIS,
+ fwnode_get_name(node));
if (IS_ERR(led->slow))
return PTR_ERR(led->slow);
- ret = of_property_count_u32_elems(np, "modes-map");
+ ret = fwnode_property_count_u32(node, "modes-map");
if (ret < 0 || ret % 3) {
- dev_err(dev, "Missing or malformed modes-map for %pOF\n", np);
+ dev_err(dev, "Missing or malformed modes-map for %pfw\n", node);
return -EINVAL;
}
@@ -196,16 +202,8 @@ static int ns2_led_register(struct device *dev, struct device_node *np,
if (!modval)
return -ENOMEM;
- for (i = 0; i < nmodes; i++) {
- u32 val;
-
- of_property_read_u32_index(np, "modes-map", 3 * i, &val);
- modval[i].mode = val;
- of_property_read_u32_index(np, "modes-map", 3 * i + 1, &val);
- modval[i].cmd_level = val;
- of_property_read_u32_index(np, "modes-map", 3 * i + 2, &val);
- modval[i].slow_level = val;
- }
+ fwnode_property_read_u32_array(node, "modes-map", (void *)modval,
+ nmodes * 3);
rwlock_init(&led->rw_lock);
@@ -228,11 +226,11 @@ static int ns2_led_register(struct device *dev, struct device_node *np,
led->sata = (mode == NS_V2_LED_SATA) ? 1 : 0;
led->cdev.brightness = (mode == NS_V2_LED_OFF) ? LED_OFF : LED_FULL;
- init_data.fwnode = of_fwnode_handle(np);
+ init_data.fwnode = node;
ret = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
if (ret)
- dev_err(dev, "Failed to register LED for node %pOF\n", np);
+ dev_err(dev, "Failed to register LED for node %pfw\n", node);
return ret;
}
@@ -246,13 +244,12 @@ MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
static int ns2_led_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct device_node *np, *child;
+ struct fwnode_handle *child;
struct ns2_led *leds;
int count;
int ret;
- np = dev_of_node(dev);
- count = of_get_available_child_count(np);
+ count = device_get_child_node_count(dev);
if (!count)
return -ENODEV;
@@ -260,10 +257,10 @@ static int ns2_led_probe(struct platform_device *pdev)
if (!leds)
return -ENOMEM;
- for_each_available_child_of_node(np, child) {
+ device_for_each_child_node(dev, child) {
ret = ns2_led_register(dev, child, leds++);
if (ret) {
- of_node_put(child);
+ fwnode_handle_put(child);
return ret;
}
}
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr
2020-09-26 20:11 [PATCH leds v2 0/2] leds: ns2: convert to fwnode API Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 1/2] " Marek Behún
@ 2020-09-26 20:11 ` Marek Behún
2020-09-30 17:23 ` Pavel Machek
1 sibling, 1 reply; 4+ messages in thread
From: Marek Behún @ 2020-09-26 20:11 UTC (permalink / raw)
To: linux-leds; +Cc: Pavel Machek, dmurphy, Marek Behún, Simon Guinot
Do not match OF match pointer with of_match_ptr, so that even if
CONFIG_OF is disabled, the driver can still be bound via another method.
Move definition of of_ns2_leds_match just before ns2_led_driver
definition, since it is not needed sooner.
Signed-off-by: Marek Behún <kabel@kernel.org>
Tested-by: Simon Guinot <simon.guinot@sequanux.org>
---
drivers/leds/leds-ns2.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index dba6bdfa861b..1677d66d8b0e 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -235,12 +235,6 @@ static int ns2_led_register(struct device *dev, struct fwnode_handle *node,
return ret;
}
-static const struct of_device_id of_ns2_leds_match[] = {
- { .compatible = "lacie,ns2-leds", },
- {},
-};
-MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
-
static int ns2_led_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -268,11 +262,17 @@ static int ns2_led_probe(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id of_ns2_leds_match[] = {
+ { .compatible = "lacie,ns2-leds", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, of_ns2_leds_match);
+
static struct platform_driver ns2_led_driver = {
.probe = ns2_led_probe,
.driver = {
.name = "leds-ns2",
- .of_match_table = of_match_ptr(of_ns2_leds_match),
+ .of_match_table = of_ns2_leds_match,
},
};
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr
2020-09-26 20:11 ` [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr Marek Behún
@ 2020-09-30 17:23 ` Pavel Machek
0 siblings, 0 replies; 4+ messages in thread
From: Pavel Machek @ 2020-09-30 17:23 UTC (permalink / raw)
To: Marek Behún; +Cc: linux-leds, dmurphy, Simon Guinot
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
Hi!
> Do not match OF match pointer with of_match_ptr, so that even if
> CONFIG_OF is disabled, the driver can still be bound via another method.
>
> Move definition of of_ns2_leds_match just before ns2_led_driver
> definition, since it is not needed sooner.
>
> Signed-off-by: Marek Behún <kabel@kernel.org>
> Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Thanks, applied.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-30 17:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-26 20:11 [PATCH leds v2 0/2] leds: ns2: convert to fwnode API Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 1/2] " Marek Behún
2020-09-26 20:11 ` [PATCH leds v2 2/2] leds: ns2: do not guard OF match pointer with of_match_ptr Marek Behún
2020-09-30 17:23 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.