|
103 | 103 | /* Channel register bits */ |
104 | 104 |
|
105 | 105 | /* RSCFDnCmCFG - Classical CAN only */ |
106 | | -#define RCANFD_CFG_SJW(x) (((x) & 0x3) << 24) |
107 | | -#define RCANFD_CFG_TSEG2(x) (((x) & 0x7) << 20) |
108 | | -#define RCANFD_CFG_TSEG1(x) (((x) & 0xf) << 16) |
109 | | -#define RCANFD_CFG_BRP(x) (((x) & 0x3ff) << 0) |
| 106 | +#define RCANFD_CFG_SJW GENMASK(25, 24) |
| 107 | +#define RCANFD_CFG_TSEG2 GENMASK(22, 20) |
| 108 | +#define RCANFD_CFG_TSEG1 GENMASK(19, 16) |
| 109 | +#define RCANFD_CFG_BRP GENMASK(9, 0) |
110 | 110 |
|
111 | 111 | /* RSCFDnCFDCmNCFG - CAN FD only */ |
112 | 112 | #define RCANFD_NCFG_NTSEG2(gpriv, x) \ |
@@ -1411,8 +1411,8 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev) |
1411 | 1411 | cfg = (RCANFD_NCFG_NTSEG1(gpriv, tseg1) | RCANFD_NCFG_NBRP(brp) | |
1412 | 1412 | RCANFD_NCFG_NSJW(gpriv, sjw) | RCANFD_NCFG_NTSEG2(gpriv, tseg2)); |
1413 | 1413 | } else { |
1414 | | - cfg = (RCANFD_CFG_TSEG1(tseg1) | RCANFD_CFG_BRP(brp) | |
1415 | | - RCANFD_CFG_SJW(sjw) | RCANFD_CFG_TSEG2(tseg2)); |
| 1414 | + cfg = FIELD_PREP(RCANFD_CFG_TSEG1, tseg1) | FIELD_PREP(RCANFD_CFG_BRP, brp) | |
| 1415 | + FIELD_PREP(RCANFD_CFG_SJW, sjw) | FIELD_PREP(RCANFD_CFG_TSEG2, tseg2); |
1416 | 1416 | } |
1417 | 1417 |
|
1418 | 1418 | rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg); |
|
0 commit comments