Skip to contentSkip to conversation

can: EG20T PCH: Fix bit timing calculation issue

PATCH Superseded Tomoya MORINAGA 1 participant 1 message Nov 26, 2010 CAN network drivers

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 12/19 can: EG20T PCH: Fix bit timing calculation issue

Quoted 1 line

From f6e0c08d92460943ec78fa2e49df72e5a911875d Mon Sep 17 00:00:00 2001

From: Tomoya MORINAGA <[email protected]>
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.

---
 drivers/net/can/pch_can.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/can/pch_can.c +2 -4
index 33c6bc0..b1fde7d 100644
@@ -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);
Signature · 1 line
1.6.0.6