Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

[~andy/linux] / drivers / net / can / flexcan.c

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 0289a6d86f660d5e97f9a2f34a2d37c6d7f1d53d..769d29ed106dbb1336745510b7fa2ff60f387bf7 100644 (file)
--- 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>
@@ -564,6 +565,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;
 }
 
@@ -652,6 +655,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), &regs->iflag1);
                netif_wake_queue(dev);
        }
@@ -865,6 +869,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);
 
@@ -893,6 +900,8 @@ static int flexcan_close(struct net_device *dev)
 
        close_candev(dev);
 
+       can_led_event(dev, CAN_LED_EVENT_STOP);
+
        return 0;
 }
 
@@ -1092,6 +1101,8 @@ static int 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);