diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 16:32:21 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 16:32:21 -0300 |
| commit | 045c901d116b35f58e6f0bcca9b2e936b669dc43 (patch) | |
| tree | 232cd4b182305954525cebcea4a29f809e3b8ea0 /drivers/net/can | |
| parent | 7250d9afe651c033d74d11c6559349bfee6fdb4c (diff) | |
| parent | d68f50bfb00f6288e812be895ea5c77932a4b9dd (diff) | |
Merge tag 'v5.15.84' into 5.15-2.2.x-imx
This is the 5.15.84 stable release
Conflicts:
sound/soc/fsl/fsl_micfil.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/mcba_usb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c index 023bd34d48e3..e9ccdcce01cc 100644 --- a/drivers/net/can/usb/mcba_usb.c +++ b/drivers/net/can/usb/mcba_usb.c @@ -47,6 +47,10 @@ #define MCBA_VER_REQ_USB 1 #define MCBA_VER_REQ_CAN 2 +/* Drive the CAN_RES signal LOW "0" to activate R24 and R25 */ +#define MCBA_VER_TERMINATION_ON 0 +#define MCBA_VER_TERMINATION_OFF 1 + #define MCBA_SIDL_EXID_MASK 0x8 #define MCBA_DLC_MASK 0xf #define MCBA_DLC_RTR_MASK 0x40 @@ -469,7 +473,7 @@ static void mcba_usb_process_ka_usb(struct mcba_priv *priv, priv->usb_ka_first_pass = false; } - if (msg->termination_state) + if (msg->termination_state == MCBA_VER_TERMINATION_ON) priv->can.termination = MCBA_TERMINATION_ENABLED; else priv->can.termination = MCBA_TERMINATION_DISABLED; @@ -789,9 +793,9 @@ static int mcba_set_termination(struct net_device *netdev, u16 term) }; if (term == MCBA_TERMINATION_ENABLED) - usb_msg.termination = 1; + usb_msg.termination = MCBA_VER_TERMINATION_ON; else - usb_msg.termination = 0; + usb_msg.termination = MCBA_VER_TERMINATION_OFF; mcba_usb_xmit_cmd(priv, (struct mcba_usb_msg *)&usb_msg); |