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

[Backport v4.0-branch] dts: atmel: sam0: Clean up devicetree #83135

Merged
merged 6 commits into from
Dec 27, 2024

Conversation

zephyrbot
Copy link
Collaborator

@zephyrbot zephyrbot commented Dec 18, 2024

Backport 01fc0a7~6..01fc0a7 from #82991.

Fixes #83148

Keep a consistent order on the nodes definitions to make it easy to read
between all the SoC series.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 6f1f598)
When running tests on sam0 platform was detected that pinctrl for ADC
were not defined for some boards. To force an error at build time
nodes should be explicity disabled. This explicity disable nodes on
devicetree that require some user configuration.

In addition, the adc feature were excluded in some boards and
samr21-xpro was correct updated.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 162f728)
Reorder and add missing aliases and chosen nodes.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 748bbd0)
The DMA is already defined on the base header. This exclude the
duplicated node.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 2e7599e)
The saml2x series provide USB to all SoC series. This moves the USB node
from saml21.dtsi to the base file saml2x.dtsi.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 34fc01e)
The samr21 is a samd21 with a builtin at86rf233 radio. Use the samd21 as
base for these SoC and drop all duplicated nodes.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
(cherry picked from commit 01fc0a7)
@zephyrbot zephyrbot added the Backport Backport PR and backport failure issues label Dec 18, 2024
@zephyrbot zephyrbot added the platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM) label Dec 18, 2024
@nandojve nandojve linked an issue Dec 18, 2024 that may be closed by this pull request
@henrikbrixandersen
Copy link
Member

#83148 is an enhancement. We usually only backport bug fixes. What's the rationale for backporting this?

@nandojve
Copy link
Member

#83148 is an enhancement. We usually only backport bug fixes. What's the rationale for backporting this?

Due to heavily changes on dts I'm not sure if future fixes/backports will be easy/possible to backport without these changes. I just want to make sure future enhancements are easy to developers to backport.

At end, this is a clean-up, I can create an issue to it too.

@dkalowsk dkalowsk added this to the v4.0.1 milestone Dec 27, 2024
@dkalowsk dkalowsk merged commit 578251b into v4.0-branch Dec 27, 2024
31 of 32 checks passed
@dkalowsk dkalowsk deleted the backport-82991-to-v4.0-branch branch December 27, 2024 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Backport PR and backport failure issues platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

dts: atmel: sam0: Clean up devicetree
6 participants