Skip to content
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

chore(CMSIS,PeriphDrivers): Sync latest MAX32657 changes #1160

Closed
wants to merge 3 commits into from

Conversation

ozersa
Copy link
Contributor

@ozersa ozersa commented Sep 9, 2024

This commit content comes from feat/ME30 branch.
CMSIS register, includes files and peripheral source files copied from feat/ME30 branch to here to merge them into main.
These files requires to push MAX32657 development to the upstream.

Checklist Before Requesting Review

  • PR Title follows correct guidelines.
  • Description of changes and all other relevant information.
  • (Optional) Link any related GitHub issues using a keyword
  • (Optional) Provide info on any relevant functional testing/validation. For API changes or significant features, this is not optional.

@ozersa
Copy link
Contributor Author

ozersa commented Sep 9, 2024

@ttmut please check i3c_reva.c file, this file content not same for main and feat/ME30 branch, the content seems changed while merging #1111
I keep main/i3c_reva.c file.

@github-actions github-actions bot added the Register Change This issue or pull request involves a change to the MSDK registers. label Sep 9, 2024
Comment on lines 156 to 158
* @brief Private SDR/I2C request structure.
* @brief Private SDR request structure.
*
* SDR/I2C read and write to an I3C target.
* SDR read and write to an I3C target.
Copy link
Contributor

Choose a reason for hiding this comment

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

Not critical but SDR/I2C ... is the correct comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Feel free to push a new commit to fix it.

@ttmut
Copy link
Contributor

ttmut commented Sep 9, 2024

@ttmut please check i3c_reva.c file, this file content not same for main and feat/ME30 branch, the content seems changed while merging #1111 I keep main/i3c_reva.c file.

main/i3c_reva.c is the correct one. Thanks.

@ozersa ozersa force-pushed the feat/me30_peripheral_and_cmsis branch from 2226980 to 89fa895 Compare September 10, 2024 09:12
ozersa and others added 3 commits September 10, 2024 12:27
This commit content comes from feat/ME30 branch.
CMSIS register, includes, peripheral source files copied from feat/ME30 branch to here
to these files being merged into main.
These files requires to push MAX32657 to the upstream.

Co-authored-by: Jake-Carter <Jake.Carter@analog.com>
Co-authored-by: sihyung-maxim <Sihyung.Woo@analog.com>
Co-authored-by: EricB-ADI <eric.busch@analogdevices.com>
Co-authored-by: Bobby <Bobby.Counts@analog.com>
Co-authored-by: Anıl Kara <anil.kara@analog.com>
Co-authored-by: Tahsin Mutlugun <Tahsin.Mutlugun@analog.com>
Co-authored-by: Sadik Ozer <sadik.ozer@analog.com>
Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>
mxc_i3c_req_t is used for both SDR and I2C mode transfers. Reflect this
in structure description.

Signed-off-by: Tahsin Mutlugun <Tahsin.Mutlugun@analog.com>
Copy link
Contributor

@Jake-Carter Jake-Carter left a comment

Choose a reason for hiding this comment

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

Thanks @ozersa

I copied your merge conflict resolutions back onto #1075

Let's just merge that one in now

@ozersa
Copy link
Contributor Author

ozersa commented Sep 11, 2024

Thanks @ozersa

I copied your merge conflict resolutions back onto #1075

Let's just merge that one in now

It is ok for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Register Change This issue or pull request involves a change to the MSDK registers.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants