* [PATCH 1/4] led: unify led trigger tables
@ 2019-12-10 17:13 Hubert Feurstein
2019-12-10 17:13 ` [PATCH 2/4] led: add documentation for net-tx and net-rx triggers Hubert Feurstein
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Hubert Feurstein @ 2019-12-10 17:13 UTC (permalink / raw)
To: barebox; +Cc: Hubert Feurstein
Currently we have two slightly different led-trigger tables. One in the
core module, and the other one in the led-triggers module. The one in the
core module, which is used to parse the device-tree triggers, is lacking
net-rx and net-tx.
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
drivers/led/core.c | 46 +++++++++++++++++++++++---------------
drivers/led/led-triggers.c | 25 ---------------------
2 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/drivers/led/core.c b/drivers/led/core.c
index 431966d06..fec7324e7 100644
--- a/drivers/led/core.c
+++ b/drivers/led/core.c
@@ -256,22 +256,35 @@ void led_unregister(struct led *led)
list_del(&led->list);
}
-struct led_trg {
- const char *str;
- enum led_trigger trg;
+static char *trigger_names[] = {
+ [LED_TRIGGER_PANIC] = "panic",
+ [LED_TRIGGER_HEARTBEAT] = "heartbeat",
+ [LED_TRIGGER_NET_RX] = "net-rx",
+ [LED_TRIGGER_NET_TX] = "net-tx",
+ [LED_TRIGGER_NET_TXRX] = "net",
+ [LED_TRIGGER_DEFAULT_ON] = "default-on",
};
-static struct led_trg triggers[] = {
- { .str = "heartbeat", LED_TRIGGER_HEARTBEAT, },
- { .str = "panic", LED_TRIGGER_PANIC, },
- { .str = "net", LED_TRIGGER_NET_TXRX, },
- { .str = "default-on", LED_TRIGGER_DEFAULT_ON, },
-};
+const char *trigger_name(enum led_trigger trigger)
+{
+ return trigger_names[trigger];
+}
+
+enum led_trigger trigger_by_name(const char *name)
+{
+ int i;
+
+ for (i = 0; i < LED_TRIGGER_MAX; i++)
+ if (!strcmp(name, trigger_names[i]))
+ return i;
+
+ return LED_TRIGGER_MAX;
+}
void led_of_parse_trigger(struct led *led, struct device_node *np)
{
+ enum led_trigger trg;
const char *trigger;
- int i;
trigger = of_get_property(np, "linux,default-trigger", NULL);
if (!trigger)
@@ -280,13 +293,10 @@ void led_of_parse_trigger(struct led *led, struct device_node *np)
if (!trigger)
return;
- for (i = 0; i < ARRAY_SIZE(triggers); i++) {
- struct led_trg *trg = &triggers[i];
- if (!strcmp(trg->str, trigger)) {
- /* disable LED before installing trigger */
- led_set(led, 0);
- led_set_trigger(trg->trg, led);
- return;
- }
+ trg = trigger_by_name(trigger);
+ if (trg != LED_TRIGGER_MAX) {
+ /* disable LED before installing trigger */
+ led_set(led, 0);
+ led_set_trigger(trg, led);
}
}
diff --git a/drivers/led/led-triggers.c b/drivers/led/led-triggers.c
index 76a1481e1..216c8639b 100644
--- a/drivers/led/led-triggers.c
+++ b/drivers/led/led-triggers.c
@@ -143,31 +143,6 @@ int led_set_trigger(enum led_trigger trigger, struct led *led)
return 0;
}
-static char *trigger_names[] = {
- [LED_TRIGGER_PANIC] = "panic",
- [LED_TRIGGER_HEARTBEAT] = "heartbeat",
- [LED_TRIGGER_NET_RX] = "net-rx",
- [LED_TRIGGER_NET_TX] = "net-tx",
- [LED_TRIGGER_NET_TXRX] = "net",
- [LED_TRIGGER_DEFAULT_ON] = "default-on",
-};
-
-const char *trigger_name(enum led_trigger trigger)
-{
- return trigger_names[trigger];
-}
-
-enum led_trigger trigger_by_name(const char *name)
-{
- int i;
-
- for (i = 0; i < LED_TRIGGER_MAX; i++)
- if (!strcmp(name, trigger_names[i]))
- return i;
-
- return LED_TRIGGER_MAX;
-}
-
/**
* led_triggers_show_info - Show information about all registered
* triggers
--
2.24.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/4] led: add documentation for net-tx and net-rx triggers
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
@ 2019-12-10 17:13 ` Hubert Feurstein
2019-12-10 17:13 ` [PATCH 3/4] led: check for 'barebox, default-trigger' when 'linux, default-trigger' is not found Hubert Feurstein
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hubert Feurstein @ 2019-12-10 17:13 UTC (permalink / raw)
To: barebox; +Cc: Hubert Feurstein
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
Documentation/devicetree/bindings/leds/common.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/leds/common.rst b/Documentation/devicetree/bindings/leds/common.rst
index 1f5ae42ca..5a592d67d 100644
--- a/Documentation/devicetree/bindings/leds/common.rst
+++ b/Documentation/devicetree/bindings/leds/common.rst
@@ -6,7 +6,9 @@ Common leds properties
* ``heartbeat`` - LED flashes at a constant rate
* ``panic`` - LED turns on when barebox panics
- * ``net`` - LED indicates network activity
+ * ``net`` - LED indicates network activity (tx and rx)
+ * ``net-rx`` - LED indicates network activity (rx only)
+ * ``net-tx`` - LED indicates network activity (tx only)
* ``label``: The label for this LED. If omitted, the label is taken
from the node name (excluding the unit address).
--
2.24.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 3/4] led: check for 'barebox, default-trigger' when 'linux, default-trigger' is not found
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
2019-12-10 17:13 ` [PATCH 2/4] led: add documentation for net-tx and net-rx triggers Hubert Feurstein
@ 2019-12-10 17:13 ` Hubert Feurstein
2019-12-10 17:13 ` [PATCH 4/4] led: parse panic-indicator from device-tree Hubert Feurstein
2019-12-11 8:39 ` [PATCH 1/4] led: unify led trigger tables Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Hubert Feurstein @ 2019-12-10 17:13 UTC (permalink / raw)
To: barebox; +Cc: Hubert Feurstein
When the linux,default-trigger is not found by barebox, then also check if
there might be a barebox,default-trigger.
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
drivers/led/core.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/led/core.c b/drivers/led/core.c
index fec7324e7..4bf19abcc 100644
--- a/drivers/led/core.c
+++ b/drivers/led/core.c
@@ -274,6 +274,9 @@ enum led_trigger trigger_by_name(const char *name)
{
int i;
+ if (!name)
+ return LED_TRIGGER_MAX;
+
for (i = 0; i < LED_TRIGGER_MAX; i++)
if (!strcmp(name, trigger_names[i]))
return i;
@@ -287,13 +290,13 @@ void led_of_parse_trigger(struct led *led, struct device_node *np)
const char *trigger;
trigger = of_get_property(np, "linux,default-trigger", NULL);
- if (!trigger)
- trigger = of_get_property(np, "barebox,default-trigger", NULL);
+ trg = trigger_by_name(trigger);
- if (!trigger)
- return;
+ if (trg == LED_TRIGGER_MAX) {
+ trigger = of_get_property(np, "barebox,default-trigger", NULL);
+ trg = trigger_by_name(trigger);
+ }
- trg = trigger_by_name(trigger);
if (trg != LED_TRIGGER_MAX) {
/* disable LED before installing trigger */
led_set(led, 0);
--
2.24.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 4/4] led: parse panic-indicator from device-tree
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
2019-12-10 17:13 ` [PATCH 2/4] led: add documentation for net-tx and net-rx triggers Hubert Feurstein
2019-12-10 17:13 ` [PATCH 3/4] led: check for 'barebox, default-trigger' when 'linux, default-trigger' is not found Hubert Feurstein
@ 2019-12-10 17:13 ` Hubert Feurstein
2019-12-11 8:39 ` [PATCH 1/4] led: unify led trigger tables Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Hubert Feurstein @ 2019-12-10 17:13 UTC (permalink / raw)
To: barebox; +Cc: Hubert Feurstein
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
Documentation/devicetree/bindings/leds/common.rst | 3 +++
drivers/led/core.c | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/common.rst b/Documentation/devicetree/bindings/leds/common.rst
index 5a592d67d..911a55f4f 100644
--- a/Documentation/devicetree/bindings/leds/common.rst
+++ b/Documentation/devicetree/bindings/leds/common.rst
@@ -12,3 +12,6 @@ Common leds properties
* ``label``: The label for this LED. If omitted, the label is taken
from the node name (excluding the unit address).
+
+* ``panic-indicator`` - This property specifies that the LED should be used as a
+ panic indicator.
diff --git a/drivers/led/core.c b/drivers/led/core.c
index 4bf19abcc..e727148a2 100644
--- a/drivers/led/core.c
+++ b/drivers/led/core.c
@@ -286,11 +286,16 @@ enum led_trigger trigger_by_name(const char *name)
void led_of_parse_trigger(struct led *led, struct device_node *np)
{
- enum led_trigger trg;
+ enum led_trigger trg = LED_TRIGGER_MAX;
const char *trigger;
- trigger = of_get_property(np, "linux,default-trigger", NULL);
- trg = trigger_by_name(trigger);
+ if (of_property_read_bool(np, "panic-indicator"))
+ trg = LED_TRIGGER_PANIC;
+
+ if (trg == LED_TRIGGER_MAX) {
+ trigger = of_get_property(np, "linux,default-trigger", NULL);
+ trg = trigger_by_name(trigger);
+ }
if (trg == LED_TRIGGER_MAX) {
trigger = of_get_property(np, "barebox,default-trigger", NULL);
--
2.24.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] led: unify led trigger tables
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
` (2 preceding siblings ...)
2019-12-10 17:13 ` [PATCH 4/4] led: parse panic-indicator from device-tree Hubert Feurstein
@ 2019-12-11 8:39 ` Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2019-12-11 8:39 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: barebox
On Tue, Dec 10, 2019 at 06:13:01PM +0100, Hubert Feurstein wrote:
> Currently we have two slightly different led-trigger tables. One in the
> core module, and the other one in the led-triggers module. The one in the
> core module, which is used to parse the device-tree triggers, is lacking
> net-rx and net-tx.
>
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> drivers/led/core.c | 46 +++++++++++++++++++++++---------------
> drivers/led/led-triggers.c | 25 ---------------------
> 2 files changed, 28 insertions(+), 43 deletions(-)
Applied, thanks
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-11 8:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-10 17:13 [PATCH 1/4] led: unify led trigger tables Hubert Feurstein
2019-12-10 17:13 ` [PATCH 2/4] led: add documentation for net-tx and net-rx triggers Hubert Feurstein
2019-12-10 17:13 ` [PATCH 3/4] led: check for 'barebox, default-trigger' when 'linux, default-trigger' is not found Hubert Feurstein
2019-12-10 17:13 ` [PATCH 4/4] led: parse panic-indicator from device-tree Hubert Feurstein
2019-12-11 8:39 ` [PATCH 1/4] led: unify led trigger tables Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox