Skip to content

ext: hal: atmel: sam: update to version 2.3.98 #12750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2019

Conversation

aurel32
Copy link
Collaborator

@aurel32 aurel32 commented Jan 26, 2019

This is an import of Atmel SAM E70 HAL version 2.3.98, and only for the
revision A of the chip. The files have been passed through dos2unix to
minimize the differences with the previous version which seems to also
have been imported that way.

On top of that the following commit has been reapplied:

  • 1333061 ("Add missing header files symbols for Atmel SAM E70)"
    => except the DACC alternate pin functions which has been fixed in the
    same way in the new version.

The following commits have not been reapplied, and the README file has
been updated accordingly:

  • 9670dc5 (Remove unused and broken preprocesor macros)
    => The macros have been changed from the _U to U style and thus are
    less likely to break compilation with some toolchains.
  • 4dcfc87 (Add missing interrupt number definitions)
    => This has been fixed with a slightly different way in the new
    version. This commit also adjusts the names in the ethernet driver.
  • 3369a96 ("ext: same70: Add missing PMC_SR_PCKRDY3 define")
    => This has been fixed the same way in the new version.

Signed-off-by: Aurelien Jarno [email protected]

@aurel32 aurel32 added platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM) EXT Has change or related to ext/ (obsolete) labels Jan 26, 2019
@aurel32 aurel32 requested a review from mnkp January 26, 2019 00:06
@galak
Copy link
Collaborator

galak commented Jan 26, 2019

On top of that the following commit has been reapplied:

  • 1333061 ("Add missing header files symbols for Atmel SAM E70)"
    => except the DACC alternate pin functions which has been fixed in the
    same way in the new version.

can this be an actual commit?

@codecov-io
Copy link

codecov-io commented Jan 26, 2019

Codecov Report

Merging #12750 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #12750   +/-   ##
=======================================
  Coverage   53.51%   53.51%           
=======================================
  Files         239      239           
  Lines       26983    26983           
  Branches     6518     6518           
=======================================
  Hits        14440    14440           
  Misses       9879     9879           
  Partials     2664     2664

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4036339...94e35c3. Read the comment docs.

@aurel32
Copy link
Collaborator Author

aurel32 commented Jan 26, 2019

On top of that the following commit has been reapplied:

  • 1333061 ("Add missing header files symbols for Atmel SAM E70)"
    => except the DACC alternate pin functions which has been fixed in the
    same way in the new version.

can this be an actual commit?

I can indeed split that into a separate commit, however that means the intermediate commits won't build. Is it acceptable?

This is an import of Atmel SAM E70 HAL version 2.3.98, and only for the
revision A of the chip. The files have been passed through dos2unix to
minimize the differences with the previous version which seems to also
have been imported that way. All the patches that have been applied on
the previous version have been removed.

Signed-off-by: Aurelien Jarno <[email protected]>
@aurel32 aurel32 force-pushed the sam-e70-hal-2.3.98-reva branch from a6d8182 to 326f441 Compare January 28, 2019 22:15
@aurel32
Copy link
Collaborator Author

aurel32 commented Jan 28, 2019

@galak I have just pushed a new version that split out the HAL update from the other patches. Note that these commits are not bisectable anymore, ie the ethernet driver won't compile with intermediate commits.

Copy link
Member

@mnkp mnkp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good with a minor remark regarding commit title. "ext: hal: atmel: sam: re-add missing header files following HAL import" should be better changed to "ext: hal: atmel: sam: re-add missing header symbols" since we are adding symbols not files.

Following the HAL import, reapply the part of commit 1333061 ("Add
missing header files symbols for Atmel SAM E70") which hasn't been fixed
upstream yet. From this commit, only the DACC alternate pin functions
have been fixed.

Signed-off-by: Aurelien Jarno <[email protected]>
Previous SAM E70 HAL version was patched by commit 4dcfc87 ("Add
missing interrupt number definitions") to add missing interrupt
definitions for SAM GMAC Priority Queues. This has been fixed in the
latest HAL by using a slightly different name. This patch updates the
driver accordingly.

Signed-off-by: Aurelien Jarno <[email protected]>
@aurel32 aurel32 force-pushed the sam-e70-hal-2.3.98-reva branch from 326f441 to 94e35c3 Compare January 30, 2019 15:59
@aurel32
Copy link
Collaborator Author

aurel32 commented Jan 30, 2019

This looks good with a minor remark regarding commit title. "ext: hal: atmel: sam: re-add missing header files following HAL import" should be better changed to "ext: hal: atmel: sam: re-add missing header symbols" since we are adding symbols not files.

@mnkp Thanks for the review. That is a good point, I have just fixed that.

@galak galak merged commit b73c9b3 into zephyrproject-rtos:master Jan 30, 2019
@aurel32 aurel32 deleted the sam-e70-hal-2.3.98-reva branch January 31, 2019 09:06
@dgloeck
Copy link
Contributor

dgloeck commented Feb 7, 2019

The new rev A headers move the GMAC ISRPQ, TBQBAPQ, RBQBAPQ, and RBSRPQ registers by 4 bytes. Can anyone confirm that this is correct for revision A?

The 2.3.98 headers for revision B also put the registers at the new addresses. This contradicts the data sheet.

Ok, this is already mentioned in #12945.

@aurel32
Copy link
Collaborator Author

aurel32 commented Feb 7, 2019

@dgloeck Yes, that has been fixed by #13126. I have opened a case at microchip, not sure it will work though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EXT Has change or related to ext/ (obsolete) platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants