lkml.org 
[lkml]   [2010]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH net-next-2.6 12/19 v5] can: EG20T PCH: Fix bit timing calculation issue
    From f6e0c08d92460943ec78fa2e49df72e5a911875d Mon Sep 17 00:00:00 2001
    From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
    Date: Thu, 18 Nov 2010 17:41:40 +0900
    Subject: [PATCH] CAN : Fix bit timing calculation issue
    Modify like use calculated value directly passed by CAN core module.

    Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
    Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
    ---
    drivers/net/can/pch_can.c | 6 ++----
    1 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
    index 33c6bc0..b1fde7d 100644
    --- a/drivers/net/can/pch_can.c
    +++ b/drivers/net/can/pch_can.c
    @@ -797,17 +797,15 @@ static int pch_set_bittiming(struct net_device *ndev)
    const struct can_bittiming *bt = &priv->can.bittiming;
    u32 canbit;
    u32 bepe;
    - u32 brp;

    /* Setting the CCE bit for accessing the Can Timing register. */
    pch_can_bit_set(&priv->regs->cont, PCH_CTRL_CCE);

    - brp = (bt->tq) / (1000000000/PCH_CAN_CLK) - 1;
    - canbit = brp & PCH_MSK_BITT_BRP;
    + canbit = (bt->brp - 1) & PCH_MSK_BITT_BRP;
    canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT;
    canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT;
    canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT;
    - bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
    + bepe = ((bt->brp - 1) & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
    iowrite32(canbit, &priv->regs->bitt);
    iowrite32(bepe, &priv->regs->brpe);
    pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE);
    --
    1.6.0.6

    \
     
     \ /
      Last update: 2010-11-26 10:33    [W:5.126 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site