Merge tag 'coresight-next-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / net / can / rcar / rcar_canfd.c

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 1e121e0..ba42cef 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
-#include <linux/can/led.h>
 #include <linux/can/dev.h>
 #include <linux/clk.h>
 #include <linux/of.h>
@@ -1128,7 +1127,6 @@ static void rcar_canfd_tx_done(struct net_device *ndev)
        /* Clear interrupt */
        rcar_canfd_write(priv->base, RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX),
                         sts & ~RCANFD_CFSTS_CFTXIF);
-       can_led_event(ndev, CAN_LED_EVENT_TX);
 }
 
 static void rcar_canfd_handle_global_err(struct rcar_canfd_global *gpriv, u32 ch)
@@ -1334,7 +1332,10 @@ static void rcar_canfd_set_bittiming(struct net_device *dev)
                cfg = (RCANFD_DCFG_DTSEG1(gpriv, tseg1) | RCANFD_DCFG_DBRP(brp) |
                       RCANFD_DCFG_DSJW(sjw) | RCANFD_DCFG_DTSEG2(gpriv, tseg2));
 
-               rcar_canfd_write(priv->base, RCANFD_F_DCFG(ch), cfg);
+               if (is_v3u(gpriv))
+                       rcar_canfd_write(priv->base, RCANFD_V3U_DCFG(ch), cfg);
+               else
+                       rcar_canfd_write(priv->base, RCANFD_F_DCFG(ch), cfg);
                netdev_dbg(priv->ndev, "drate: brp %u, sjw %u, tseg1 %u, tseg2 %u\n",
                           brp, sjw, tseg1, tseg2);
        } else {
@@ -1419,7 +1420,6 @@ static int rcar_canfd_open(struct net_device *ndev)
        if (err)
                goto out_close;
        netif_start_queue(ndev);
-       can_led_event(ndev, CAN_LED_EVENT_OPEN);
        return 0;
 out_close:
        napi_disable(&priv->napi);
@@ -1469,7 +1469,6 @@ static int rcar_canfd_close(struct net_device *ndev)
        napi_disable(&priv->napi);
        clk_disable_unprepare(gpriv->can_clk);
        close_candev(ndev);
-       can_led_event(ndev, CAN_LED_EVENT_STOP);
        return 0;
 }
 
@@ -1619,8 +1618,6 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)
         */
        rcar_canfd_write(priv->base, RCANFD_RFPCTR(gpriv, ridx), 0xff);
 
-       can_led_event(priv->ndev, CAN_LED_EVENT_RX);
-
        if (!(cf->can_id & CAN_RTR_FLAG))
                stats->rx_bytes += cf->len;
        stats->rx_packets++;
@@ -1789,10 +1786,9 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,
        priv->gpriv = gpriv;
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
-       netif_napi_add(ndev, &priv->napi, rcar_canfd_rx_poll,
-                      RCANFD_NAPI_WEIGHT);
+       netif_napi_add_weight(ndev, &priv->napi, rcar_canfd_rx_poll,
+                             RCANFD_NAPI_WEIGHT);
        spin_lock_init(&priv->tx_lock);
-       devm_can_led_init(ndev);
        gpriv->ch[priv->channel] = priv;
        err = register_candev(ndev);
        if (err) {