]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
can: sja1000: add LED trigger support
authorFabio Baltieri <fabio.baltieri@gmail.com>
Tue, 18 Dec 2012 17:51:03 +0000 (18:51 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sat, 26 Jan 2013 15:59:00 +0000 (16:59 +0100)
Add support for canbus activity led indicators on sja1000 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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/sja1000/sja1000.c

index 83ee11eca0e2de4a54220bbc9e2b0d55c6edf057..daf4013a8fc720ca0c73a9df96b647ad5c314839 100644 (file)
@@ -60,6 +60,7 @@
 
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
+#include <linux/can/led.h>
 
 #include "sja1000.h"
 
@@ -368,6 +369,8 @@ static void sja1000_rx(struct net_device *dev)
 
        stats->rx_packets++;
        stats->rx_bytes += cf->can_dlc;
+
+       can_led_event(dev, CAN_LED_EVENT_RX);
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
@@ -521,6 +524,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                                can_get_echo_skb(dev, 0);
                        }
                        netif_wake_queue(dev);
+                       can_led_event(dev, CAN_LED_EVENT_TX);
                }
                if (isrc & IRQ_RI) {
                        /* receive interrupt */
@@ -575,6 +579,8 @@ static int sja1000_open(struct net_device *dev)
        /* init and start chi */
        sja1000_start(dev);
 
+       can_led_event(dev, CAN_LED_EVENT_OPEN);
+
        netif_start_queue(dev);
 
        return 0;
@@ -592,6 +598,8 @@ static int sja1000_close(struct net_device *dev)
 
        close_candev(dev);
 
+       can_led_event(dev, CAN_LED_EVENT_STOP);
+
        return 0;
 }
 
@@ -639,6 +647,8 @@ static const struct net_device_ops sja1000_netdev_ops = {
 
 int register_sja1000dev(struct net_device *dev)
 {
+       int ret;
+
        if (!sja1000_probe_chip(dev))
                return -ENODEV;
 
@@ -648,7 +658,12 @@ int register_sja1000dev(struct net_device *dev)
        set_reset_mode(dev);
        chipset_init(dev);
 
-       return register_candev(dev);
+       ret =  register_candev(dev);
+
+       if (!ret)
+               devm_can_led_init(dev);
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(register_sja1000dev);