Skip to content

Conversation

@EvilOlaf
Copy link
Member

@EvilOlaf EvilOlaf commented Dec 9, 2025

Description

An hacked together attempt to bump sunxi family to 6.18 in the major spirit somewhere between I-pretend-to-know-what-I-am-doing and I-have-no-idea-what-I-am-doing.

  • I re-extracted all of megi's patches from their individual branches and sorted them in the same order as megi applied them to their integration branch orange-pi-6.18.
  • Then I did the same with Jernej's refactored sun4i drm patches
    • Removed any sun4i drm patches from megi since they dont play along. Did zero investigation why.

Todo

  • address all remaining disabled patches manually (PLEASE HELP and push your fixes into this branch)
    • patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch (left untouched until wifi is sorted)
    • patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch (I assume collides with sun4i-drm patchset??)
    • patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch ???
  • fix uwe wifi. Currently it is disabled since it breaks compilation. Re-enable in drivers_network.sh needs testing
  • xradio was fixed by reverting back to the origin of Igor's fork. Either sync fork or adjust wording in the drivers_network.sh

How Has This Been Tested?

  • Orangepi Zero build and boot
  • other sunxi and sunxi64 devices

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 9, 2025

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

115 files out of 300 files are above the max files limit of 100. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added size/large PR with 250 lines or more 02 Milestone: First quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Framework Framework components Patches Patches related to kernel, U-Boot, ... labels Dec 9, 2025
@EvilOlaf
Copy link
Member Author

EvilOlaf commented Dec 9, 2025

@radoslavv @robertojguerra Would you mind addressing enable-TV-Output-on-OrangePi-Zero-LTE.patch ?

@EvilOlaf
Copy link
Member Author

The patch was not fully mainlined, particularly I don't see anything about y direction resistance which is part of Fix-ghost-touches-on-tsc2007-tft-screen.patch. I don't have the tft module to test with, so can't tell if ghost touches still happen now or not.

https://paste.armbian.com/vuduwugamu

I noticed where u32 rt = 0; is now u64 and I think rest of this hunk also does no longer apply without modification. I don't understand the code's meaning, so I cannot tell if that makes any sense.

@EvilOlaf

This comment was marked as outdated.

@EvilOlaf EvilOlaf marked this pull request as ready for review December 11, 2025 05:26
@EvilOlaf EvilOlaf changed the title WIP: sunxi: bump edge to 6.18 sunxi: bump edge to 6.18 Dec 11, 2025
@EvilOlaf
Copy link
Member Author

@coderabbitai review

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 11, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@EvilOlaf
Copy link
Member Author

I think I sorted most. This needs testing against H3 H5 H6 H616 and H618 devices.

@EvilOlaf
Copy link
Member Author

Tested with Opi Zero2 (H616), seems good. Did only wifi scan to see if it detects anything. No further tests.
Fixup scripts are still missing (check linked issue above), but basic functionality is there either way. So this can be addressed later as well.

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

Labels

02 Milestone: First quarter release Framework Framework components Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more

Development

Successfully merging this pull request may close these issues.

2 participants