Skip to content

Conversation

@martinjaeger
Copy link
Member

See commit messages.

@martinjaeger martinjaeger requested a review from nashif as a code owner May 20, 2021 06:22
@martinjaeger martinjaeger added the Release Notes To be mentioned in the release notes label May 20, 2021
@martinjaeger martinjaeger added this to the v2.6.0 milestone May 20, 2021
@str4t0m
Copy link
Contributor

str4t0m commented May 20, 2021

I'm not sure if we should mention STM32G0 CAN-FD support until #34963 is merged.

While all the tests pass on STM32G4, the assert checking the valid range of sjw failed due to the uninitialized timing.sjw and caused all tests to fail on STM32G0.
#34963 includes a commit that initializes timing.sjw in case CAN-FD is enabled.
Is there a chance that PR could still be merged in 2.6?

@martinjaeger
Copy link
Member Author

@str4t0m Makes sense, I can take out the G0 remark again. For some reason I thought that the devicetree nodes for G0 also made it into the tree already.

I guess it can't be merged into 2.6 anymore. But your PR also contains a bugfix, which could still get merged if it's in a separate PR.

@alexanderwachter
Copy link
Member

It has to be merged for 2.6 since it is a bug fix

@martinjaeger
Copy link
Member Author

It has to be merged for 2.6 since it is a bug fix

Well, yes, it's partly a bugfix and partly a new "feature". But the entire PR has been marked as "2.7". I'm happy to do a quick review if you think we can still get the entire PR in.

This new subsystem was introduced in 2.6 for the first time.

Signed-off-by: Martin Jäger <[email protected]>
New CAN-FD driver based on M_CAN IP and some updates to ISO-TP.

Signed-off-by: Martin Jäger <[email protected]>
@martinjaeger
Copy link
Member Author

@str4t0m updated the notes to include the STM32G4 only.
@alexanderwachter let me know if I forgot any other important change for CAN.

@galak galak merged commit 574746e into zephyrproject-rtos:main May 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: Documentation Release Notes To be mentioned in the release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants