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.

Sign up for GitHub

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

Jump to bottom

fix Silabs SoC families #69402

Merged
merged 6 commits into from
Feb 27, 2024
Merged

fix Silabs SoC families #69402

merged 6 commits into from
Feb 27, 2024

Conversation

jerome-pouiller
Copy link
Contributor

No description provided.

@zephyrbot zephyrbot added area: Timer Timer area: Pinctrl platform: Silabs Silicon Labs area: UART Universal Asynchronous Receiver-Transmitter labels Feb 23, 2024
@github-actions GitHub Actions
Copy link

Hello @jerome-pouiller, and thank you very much for your first pull request to the Zephyr project!
Our Continuous Integration pipeline will execute a series of checks on your Pull Request commit messages and code, and you are expected to address any failures by updating the PR. Please take a look at our commit message guidelines to find out how to format your commit messages, and at our contribution workflow to understand how to update your Pull Request. If you haven't already, please make sure to review the project's Contributor Expectations and update (by amending and force-pushing the commits) your pull request if necessary.
If you are stuck or need help please join us on Discord and ask your question there. Additionally, you can escalate the review when applicable. 😊

@zephyrbot
Copy link
Collaborator

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_silabs pull/58/head zephyrproject-rtos/hal_silabs#59 zephyrproject-rtos/hal_silabs#59/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@zephyrbot zephyrbot added manifest manifest-hal_silabs DNM This PR should not be merged (Do Not Merge) labels Feb 23, 2024
@jerome-pouiller
Copy link
Contributor Author

@nordicjm could you review this PR?

nordicjm
nordicjm reviewed Feb 26, 2024
View reviewed changes
Copy link
Collaborator

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

Needs to be signed off and follow https://docs.zephyrproject.org/latest/contribute/guidelines.html

soc/silabs/Kconfig.soc Outdated Show resolved Hide resolved
drivers/serial/Kconfig.gecko
@@ -10,6 +10,6 @@ config UART_GECKO
select SERIAL_HAS_DRIVER
select SERIAL_SUPPORT_INTERRUPT
select SOC_GECKO_USART
select PINCTRL if SOC_GECKO_SERIES1
select PINCTRL if SOC_FAMILY_SILABS_S1
Copy link
Collaborator

Choose a reason for hiding this comment

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

(unrelated to change) but why is pinctrl only selected for a specific series and not the rest?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think PINCTRL is also needed for Series 2. For Series 2, the symbol is set in defconfigs of the boards. Obviously, this does not make sense. I believe this symbol should relocate in soc/silabs/s*/Kconfig.soc.

soc/silabs/s0/efm32hg/Kconfig.soc Outdated Show resolved Hide resolved
nordicjm
nordicjm reviewed Feb 26, 2024
View reviewed changes
soc/silabs/soc.yml Outdated Show resolved Hide resolved
soc/silabs/soc.yml Outdated Show resolved Hide resolved
soc/silabs/soc.yml Outdated Show resolved Hide resolved
@jerome-pouiller
Copy link
Contributor Author

v2:

  • Rename Silabs SoC Families (Jamie)
  • Relocate SDID definitions (Jamie)
  • Fix remaining uses of SOC_GECKO_SERIES*
  • Fix spaces instead of tabs in Kconfig files
  • Fix definitions of SDIDs
  • Fix include paths for Series 2 (sl_device_init_dpll_config.h was not found)
  • Fill commit log bodies
  • Add signed-off (Jamie)

nordicjm
nordicjm reviewed Feb 26, 2024
View reviewed changes
soc/silabs/soc.yml
@@ -1,9 +1,20 @@
family:
- name: silabs_exx32
Copy link
Collaborator

Choose a reason for hiding this comment

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

for a follow up (not this PR) could you add vendor: silabs

@jerome-pouiller
soc: silabs: split in families
956767e 
EXX32 does not really makes sense. Silabs tends to talk about "series
0", "series 1" and "series 2".

Note all Silabs chipsets (whatever their family) tend to share
components. So this PR introduces SOC_VENDOR_SILABS to match these
common parts.

Signed-off-by: Jérôme Pouiller <[email protected]>
@jerome-pouiller
soc: silabs: align comments with soc tree
f18c196 
Cosmetics changes to reflect the tree organisation.

Signed-off-by: Jérôme Pouiller <[email protected]>
@jerome-pouiller
soc: silabs: SOC_FAMILY_* replace SOC_GECKO_SERIES*
6948cd5 
SOC_GECKO_SERIES* is now redundant with SOC_FAMILY_*.

Signed-off-by: Jérôme Pouiller <[email protected]>
@jerome-pouiller
soc: silabs: introduce SOC_GECKO_SDID
f32def6 
Silabs hardware layer uses Silicon Die ID (SDID) for conditional
code. This patch defines SDID directly from Kconfig so Silabs HAL does
not have define it.

Signed-off-by: Jérôme Pouiller <[email protected]>
@jerome-pouiller
soc: silabs: drop useless defconfigs
0f1946a 
Currently, some soc subdirectories contains Kconfig.defconfig.<soc-name>
and Kconfig.defconfig. However:
  - Kconfig.defconfig.<soc-name> is included unconditionally by
    Kconfig.defconfig
  - each subdirectory only contains one SoC

So, it does not make sense to keep these two files.

Signed-off-by: Jérôme Pouiller <[email protected]>
@jerome-pouiller
manifest: Update hal_silabs
949cc58 
Some changes in hal_silabs are necessary to apply this PR.

Signed-off-by: Jérôme Pouiller <[email protected]>
@zephyrbot zephyrbot added the area: HWINFO Hardware Information Driver label Feb 26, 2024
@jerome-pouiller
Copy link
Contributor Author

v3:

  • fix occurence of SOC_FAMILY_SILABS_EXX32 in drivers/hwinfo
  • fix spaces in Kconfig

@dcpleung dcpleung assigned fkokosinski and unassigned dcpleung Feb 26, 2024
@nordicjm nordicjm removed the DNM This PR should not be merged (Do Not Merge) label Feb 27, 2024
@nordicjm nordicjm merged commit 0b5d677 into zephyrproject-rtos:collab-hwm Feb 27, 2024
23 of 25 checks passed
@github-actions GitHub Actions
Copy link

Hi @jerome-pouiller!
Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a fantastic achievement, and we're thrilled to have you as part of our community!

To celebrate this milestone and showcase your contribution, we'd love to award you the Zephyr Technical Contributor badge. If you're interested, please claim your badge by filling out this form: Claim Your Zephyr Badge.

Thank you for your valuable input, and we look forward to seeing more of your contributions in the future! 🪁

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordicjm nordicjm nordicjm approved these changes

@andyross andyross Awaiting requested review from andyross

@dcpleung dcpleung Awaiting requested review from dcpleung

@fkokosinski fkokosinski Awaiting requested review from fkokosinski

@gmarull gmarull Awaiting requested review from gmarull

@mnkp mnkp Awaiting requested review from mnkp

@teburd teburd Awaiting requested review from teburd

@tgorochowik tgorochowik Awaiting requested review from tgorochowik

@yonsch yonsch Awaiting requested review from yonsch

@alexanderwachter alexanderwachter Awaiting requested review from alexanderwachter

Assignees

@fkokosinski fkokosinski

Labels
area: HWINFO Hardware Information Driver area: Pinctrl area: Timer Timer area: UART Universal Asynchronous Receiver-Transmitter manifest manifest-hal_silabs platform: Silabs Silicon Labs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jerome-pouiller @zephyrbot @nordicjm @fkokosinski @dcpleung