aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/pch_can.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 354097872cb..5a6a0df5141 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -786,17 +786,15 @@ static int pch_set_bittiming(struct net_device *ndev)
786 const struct can_bittiming *bt = &priv->can.bittiming; 786 const struct can_bittiming *bt = &priv->can.bittiming;
787 u32 canbit; 787 u32 canbit;
788 u32 bepe; 788 u32 bepe;
789 u32 brp;
790 789
791 /* Setting the CCE bit for accessing the Can Timing register. */ 790 /* Setting the CCE bit for accessing the Can Timing register. */
792 pch_can_bit_set(&priv->regs->cont, PCH_CTRL_CCE); 791 pch_can_bit_set(&priv->regs->cont, PCH_CTRL_CCE);
793 792
794 brp = (bt->tq) / (1000000000/PCH_CAN_CLK) - 1; 793 canbit = (bt->brp - 1) & PCH_MSK_BITT_BRP;
795 canbit = brp & PCH_MSK_BITT_BRP;
796 canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT; 794 canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT;
797 canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT; 795 canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT;
798 canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT; 796 canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT;
799 bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT; 797 bepe = ((bt->brp - 1) & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
800 iowrite32(canbit, &priv->regs->bitt); 798 iowrite32(canbit, &priv->regs->bitt);
801 iowrite32(bepe, &priv->regs->brpe); 799 iowrite32(bepe, &priv->regs->brpe);
802 pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE); 800 pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE);