lkml.org 
[lkml]   [2017]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 17/23] can: sun4i: fix loopback mode
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gerhard Bertelsmann <info@gerhard-bertelsmann.de>

    commit 3a379f5b36ae039dfeb6f73316e47ab1af4945df upstream.

    Fix loopback mode by setting the right flag and remove presume mode.

    Signed-off-by: Gerhard Bertelsmann <info@gerhard-bertelsmann.de>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/sun4i_can.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/net/can/sun4i_can.c
    +++ b/drivers/net/can/sun4i_can.c
    @@ -342,7 +342,7 @@ static int sun4i_can_start(struct net_de

    /* enter the selected mode */
    mod_reg_val = readl(priv->base + SUN4I_REG_MSEL_ADDR);
    - if (priv->can.ctrlmode & CAN_CTRLMODE_PRESUME_ACK)
    + if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
    mod_reg_val |= SUN4I_MSEL_LOOPBACK_MODE;
    else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
    mod_reg_val |= SUN4I_MSEL_LISTEN_ONLY_MODE;
    @@ -811,7 +811,6 @@ static int sun4ican_probe(struct platfor
    priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING |
    CAN_CTRLMODE_LISTENONLY |
    CAN_CTRLMODE_LOOPBACK |
    - CAN_CTRLMODE_PRESUME_ACK |
    CAN_CTRLMODE_3_SAMPLES;
    priv->base = addr;
    priv->clk = clk;

    \
     
     \ /
      Last update: 2017-10-31 11:15    [W:4.098 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site