From: Fabio Baltieri <fabio.baltieri@gmail.com>
To: linux-can@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Fabio Baltieri <fabio.baltieri@gmail.com>,
Oliver Hartkopp <socketcan@hartkopp.net>,
Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH can-next v5 2/2] can: flexcan: add LED trigger support
Date: Wed, 1 Aug 2012 13:49:42 +0200 [thread overview]
Message-ID: <1343821782-1346-2-git-send-email-fabio.baltieri@gmail.com> (raw)
In-Reply-To: <1343821782-1346-1-git-send-email-fabio.baltieri@gmail.com>
Add support for canbus activity led indicators on flexcan devices by
calling appropriate can_led_* functions.
These are only enabled when CONFIG_CAN_LEDS is Y, becomes no-op
otherwise.
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
---
drivers/net/can/flexcan.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index c5f1431..6467fc1 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -23,6 +23,7 @@
#include <linux/can.h>
#include <linux/can/dev.h>
#include <linux/can/error.h>
+#include <linux/can/led.h>
#include <linux/can/platform/flexcan.h>
#include <linux/clk.h>
#include <linux/delay.h>
@@ -547,6 +548,8 @@ static int flexcan_read_frame(struct net_device *dev)
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+ can_led_event(dev, CAN_LED_EVENT_RX);
+
return 1;
}
@@ -635,6 +638,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
if (reg_iflag1 & (1 << FLEXCAN_TX_BUF_ID)) {
stats->tx_bytes += can_get_echo_skb(dev, 0);
stats->tx_packets++;
+ can_led_event(dev, CAN_LED_EVENT_TX);
flexcan_write((1 << FLEXCAN_TX_BUF_ID), ®s->iflag1);
netif_wake_queue(dev);
}
@@ -844,6 +848,9 @@ static int flexcan_open(struct net_device *dev)
err = flexcan_chip_start(dev);
if (err)
goto out_close;
+
+ can_led_event(dev, CAN_LED_EVENT_OPEN);
+
napi_enable(&priv->napi);
netif_start_queue(dev);
@@ -872,6 +879,8 @@ static int flexcan_close(struct net_device *dev)
close_candev(dev);
+ can_led_event(dev, CAN_LED_EVENT_STOP);
+
return 0;
}
@@ -1068,6 +1077,8 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
goto failed_register;
}
+ devm_can_led_init(dev);
+
dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%d)\n",
priv->base, dev->irq);
--
1.7.11.rc1.9.gf623ca1.dirty
next prev parent reply other threads:[~2012-08-01 11:49 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-30 19:20 [PATCH can-next v3 1/2] can: add tx/rx LED trigger support Fabio Baltieri
2012-07-30 19:20 ` [PATCH can-next v3 2/2] can: flexcan: add " Fabio Baltieri
2012-07-30 21:17 ` [PATCH can-next v3 1/2] can: add tx/rx " Marc Kleine-Budde
2012-07-31 6:57 ` Fabio Baltieri
2012-07-31 7:10 ` Marc Kleine-Budde
2012-07-31 11:57 ` Fabio Baltieri
2012-07-31 12:00 ` Marc Kleine-Budde
2012-07-31 22:05 ` [PATCH can-next v4] " Fabio Baltieri
2012-08-01 9:36 ` Marc Kleine-Budde
2012-08-01 10:07 ` Marc Kleine-Budde
2012-08-01 10:30 ` Fabio Baltieri
2012-08-01 11:37 ` Marc Kleine-Budde
2012-08-01 11:49 ` [PATCH can-next v5 1/2] " Fabio Baltieri
2012-08-01 11:49 ` Fabio Baltieri [this message]
2012-08-01 11:53 ` [PATCH can-next v5 2/2] can: flexcan: add " Marc Kleine-Budde
2012-08-01 12:24 ` Fabio Baltieri
2012-08-01 12:30 ` Marc Kleine-Budde
2012-08-01 21:02 ` Marc Kleine-Budde
2012-08-01 11:59 ` [PATCH can-next v5 1/2] can: add tx/rx " Marc Kleine-Budde
2012-08-01 12:06 ` Oliver Hartkopp
2012-08-01 12:18 ` Marc Kleine-Budde
2012-08-01 18:21 ` [PATCH can-next v6] " Fabio Baltieri
2012-08-01 21:00 ` Marc Kleine-Budde
2012-08-01 22:38 ` Fabio Baltieri
2012-08-01 21:05 ` Oliver Hartkopp
2012-08-24 5:10 ` Kurt Van Dijck
2012-08-24 11:28 ` Marc Kleine-Budde
2012-08-24 12:42 ` Kurt Van Dijck
2012-08-24 22:01 ` Fabio Baltieri
2012-08-25 20:25 ` Kurt Van Dijck
2012-09-03 12:40 ` Marc Kleine-Budde
2012-09-03 18:13 ` Kurt Van Dijck
2012-09-03 18:29 ` Fabio Baltieri
2012-09-03 20:54 ` Oliver Hartkopp
2012-09-04 7:11 ` Kurt Van Dijck
2012-09-04 9:29 ` [PATCH] can: rename LED trigger name on netdev renames Kurt Van Dijck
2012-09-06 18:59 ` Fabio Baltieri
2012-09-06 19:31 ` Oliver Hartkopp
2012-09-06 20:46 ` Fabio Baltieri
2012-09-07 7:19 ` Kurt Van Dijck
2012-09-09 16:17 ` [PATCH v2] " Fabio Baltieri
2012-09-10 14:25 ` [PATCH] can: export a safe netdev_priv wrapper for candev Kurt Van Dijck
2012-09-10 18:22 ` Oliver Hartkopp
2012-09-10 18:29 ` Fabio Baltieri
2012-09-10 19:55 ` [PATCH v2] " Kurt Van Dijck
2012-09-10 14:28 ` [PATCH v3] can: rename LED trigger name on netdev renames Kurt Van Dijck
2012-09-10 18:25 ` Oliver Hartkopp
2012-09-10 18:40 ` Fabio Baltieri
2012-09-10 19:01 ` Oliver Hartkopp
2012-09-10 20:08 ` Kurt Van Dijck
2012-09-11 5:42 ` Oliver Hartkopp
2012-09-11 7:13 ` Fabio Baltieri
2012-09-12 7:22 ` Kurt Van Dijck
2012-09-11 8:05 ` Kurt Van Dijck
2012-09-10 20:06 ` [PATCH v4] " Kurt Van Dijck
2012-09-11 21:04 ` Fabio Baltieri
2012-09-04 20:15 ` [PATCH can-next v6] can: add tx/rx LED trigger support Fabio Baltieri
2012-09-06 10:33 ` Kurt Van Dijck
2012-09-06 11:17 ` Fabio Baltieri
2012-09-06 15:11 ` Kurt Van Dijck
2012-09-06 20:57 ` Fabio Baltieri
2012-09-07 7:04 ` Kurt Van Dijck
2012-09-07 18:59 ` Fabio Baltieri
2012-07-31 8:46 ` [PATCH can-next v3 1/2] " Wolfgang Grandegger
2012-07-31 10:12 ` Marc Kleine-Budde
2012-07-31 11:55 ` Fabio Baltieri
2012-07-31 12:14 ` Fabio Baltieri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343821782-1346-2-git-send-email-fabio.baltieri@gmail.com \
--to=fabio.baltieri@gmail.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=socketcan@hartkopp.net \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).