Skip to content

Rpi 6.6.y arm64 defconfigs #2816

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
Merged
romandariana merged 4 commits into from
Jun 16, 2025
Merged

Rpi 6.6.y arm64 defconfigs #2816

romandariana merged 4 commits into from
Jun 16, 2025

Conversation

@romandariana
Copy link
Contributor

@romandariana romandariana commented Jun 10, 2025

PR Description

Add arm64 ADI defconfigs for RPi4 and RPi5.

PR Type

  • New feature (a change that adds new functionality)

PR Checklist

  • I have conducted a self-review of my own code changes
  • I have tested the changes on the relevant hardware

nunojsa
nunojsa reviewed Jun 11, 2025
View reviewed changes
Copy link
Collaborator

@nunojsa nunojsa left a comment

Choose a reason for hiding this comment

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

This would also be the time where you could add the CI jobs for these new two configs. Another note is for commit subjects. No need for the "drivers:" prefix

drivers/pwm/pwm-rp1.c

pwmchip_remove(&pc->chip);

return 0;
Copy link
Collaborator

@nunojsa nunojsa Jun 11, 2025

Choose a reason for hiding this comment

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

this patch looks like is updating the driver not adding it?

Copy link
Contributor Author

@romandariana romandariana Jun 11, 2025

Choose a reason for hiding this comment

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

I cherry picked the (only) commit adding the driver on the rpi linux 6.13 branch. Should I change the description? maybe also squash this and the next commit that fixes this driver to match the pwm interface?

Copy link
Collaborator

@nunojsa nunojsa Jun 12, 2025

Choose a reason for hiding this comment

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

Since it seems we cannot cherry-pick individual patches maybe just squash all patches and change the description to say that we need to modify the driver to match APIs A and B

@romandariana
Copy link
Contributor Author

romandariana commented Jun 11, 2025 •
edited
Loading

v1 -> v2:
- add ci builds

@romandariana romandariana force-pushed the rpi-6.6.y_arm64_defconfigs branch from 7f5eddb to 5d1b038 Compare June 11, 2025 13:14
@romandariana
Copy link
Contributor Author

romandariana commented Jun 11, 2025

v2 -> v3:
- use variable image name for rpi builds

@gastmaier
Copy link
Contributor

gastmaier commented Jun 11, 2025 •
edited
Loading

I know that the rpi1.c files are not maintained by us, but the reason for the auto inferred ci to be failing is because the rpi1.c depends on symbol CONFIG_PCI_MSI to define the pci_msi_* methods, but never sets so.

Opened a pr at raspberrypi/linux#6891

about

error: the following would cause module name conflict:
  drivers/mfd/rp1.ko
  drivers/firmware/rp1.ko

was fixed last week at raspberrypi/linux@564a5ad

nunojsa
nunojsa reviewed Jun 12, 2025
View reviewed changes
Copy link
Collaborator

@nunojsa nunojsa left a comment

Choose a reason for hiding this comment

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

It seems that CI needs some fixing

drivers/pwm/pwm-rp1.c

pwmchip_remove(&pc->chip);

return 0;
Copy link
Collaborator

@nunojsa nunojsa Jun 12, 2025

Choose a reason for hiding this comment

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

Since it seems we cannot cherry-pick individual patches maybe just squash all patches and change the description to say that we need to modify the driver to match APIs A and B

@romandariana romandariana force-pushed the rpi-6.6.y_arm64_defconfigs branch from 5d1b038 to 46f0968 Compare June 12, 2025 13:11
@romandariana
Copy link
Contributor Author

romandariana commented Jun 12, 2025

v3 -> v4:
- squash the 2 patches updating the same driver as @nunojsa suggested
- remove drivers: from commit names
- cherry-pick the fix @gastmaier signaled
- remove the ci commits from this pull request. i will make a pr into the main branch with the commits adding the arm64 rpi4/5 defconfigs and the corresponding ci additions

romandariana and others added 4 commits June 12, 2025 16:17
@romandariana
pwm: pwm-rp1.c: Update driver
8258805 
Update driver to match both the current pwm and the platform_driver
interface.

Signed-off-by: Alisa-Dariana Roman <[email protected]>
@romandariana
pwm: pwm-pio-rp1.c: Update driver
89f7e0c 
Update driver to match the rpi 6.13 linux repository analog driver.
Since pwm interface was backported to this version, this driver was no
longer matching the interface.

Also match the current platform_driver interface.

Signed-off-by: Alisa-Dariana Roman <[email protected]>
@romandariana
Add module imports
23f7f38 
Add module import statements for drivers. The build was failing because
of missing symbols.

Signed-off-by: Alisa-Dariana Roman <[email protected]>
@6by9 @romandariana
firmware: rp1: Rename to rp1-fw to avoid module name collision
c3eb47b 
There is already the driver in drivers/mfd/rp1.ko, so having
drivers/firmware/rp1.ko can cause issues when using modinfo
and similar, and we can get errors with "Module rp1 is already
loaded" when trying to load it.

Rename the module so that the name is unique.

Signed-off-by: Dave Stevenson <[email protected]>
(cherry picked from commit 564a5ad)
@romandariana romandariana force-pushed the rpi-6.6.y_arm64_defconfigs branch from 46f0968 to c3eb47b Compare June 12, 2025 13:17
@romandariana
Copy link
Contributor Author

romandariana commented Jun 12, 2025 •
edited
Loading

v4 -> v5:
- improve commit description

Also, should I mention somewhere the name and email of the person who made the drivers updates on the rpi linux repo?

@romandariana romandariana mentioned this pull request Jun 12, 2025
Merged
3 tasks
@romandariana romandariana self-assigned this Jun 12, 2025
@romandariana romandariana mentioned this pull request Jun 13, 2025
Closed
@romandariana romandariana merged commit eb0e4ef into rpi-6.6.y Jun 16, 2025
7 of 13 checks passed
@romandariana romandariana deleted the rpi-6.6.y_arm64_defconfigs branch June 16, 2025 09:19
@gastmaier gastmaier mentioned this pull request Jun 20, 2025
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nunojsa nunojsa nunojsa approved these changes

@mhennerich mhennerich Awaiting requested review from mhennerich mhennerich is a code owner

@dbogdan dbogdan Awaiting requested review from dbogdan dbogdan is a code owner

@btogorean btogorean Awaiting requested review from btogorean btogorean is a code owner

@chegbeli chegbeli Awaiting requested review from chegbeli chegbeli is a code owner

@buha buha Awaiting requested review from buha buha is a code owner

@amiclaus amiclaus Awaiting requested review from amiclaus amiclaus is a code owner

@rbolboac rbolboac Awaiting requested review from rbolboac rbolboac is a code owner

@danmois danmois Awaiting requested review from danmois danmois is a code owner

@CiprianRegus CiprianRegus Awaiting requested review from CiprianRegus CiprianRegus is a code owner

@machschmitt machschmitt Awaiting requested review from machschmitt machschmitt is a code owner

Assignees

@romandariana romandariana

Labels

bug drivers enhancement question

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@romandariana @gastmaier @nunojsa @6by9