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
  • 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

Ignore keyword(s) in the title.

⛔ Ignored keywords (2)
  • wip
  • draft

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

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

✨ Finishing touches
🧪 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

if linux-version compare "${version}" ge 5.15 && [[ "$LINUXFAMILY" == sun* || "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk35xx ]]; then

return 0
Copy link
Member Author

Choose a reason for hiding this comment

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

Remove this once uwe5622 is addressed

display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"

fetch_from_repo "$GITHUB_SOURCE/igorpecovnik/xradio" "xradio" "${xradio_xr819_ver}" "yes" # Forked from https://github.com/fifteenhex/xradio
fetch_from_repo "$GITHUB_SOURCE/fifteenhex/xradio" "xradio" "${xradio_xr819_ver}" "yes" # Forked from https://github.com/fifteenhex/xradio
Copy link
Member Author

Choose a reason for hiding this comment

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

The comment mentioned to adjust or sync our own fork

@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

EvilOlaf commented Dec 9, 2025

@JohnTheCoolingFan Would you mind checking Fix-ghost-touches-on-tsc2007-tft-screen.patch ? Upstream code has changed and I don't know how to address this.

@JohnTheCoolingFan
Copy link
Contributor

JohnTheCoolingFan commented Dec 9, 2025

@JohnTheCoolingFan Would you mind checking Fix-ghost-touches-on-tsc2007-tft-screen.patch ? Upstream code has changed and I don't know how to address this.

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.

@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
Copy link
Member Author

@igorpecovnik regarding uwe5622 wifi:
https://paste.armbian.de/debamowini line 9650 ff.

   drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c: In function 'marlin_registsr_bt_wake':
   drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c:1387:15: error: implicit declaration of function 'devm_gpio_request'; did you mean 'devm_gpio_request_one'? [-Werror=implicit-function-declaration]
    1387 |         ret = devm_gpio_request(dev, bt_wake_host_gpio,
         |               ^~~~~~~~~~~~~~~~~
         |               devm_gpio_request_one

Asked LLM for solutions. I have no idea if there is any value in these informations.
https://www.perplexity.ai/search/since-linux-6-18-the-uwe5622-w-_XeLgd1cQRyYnFsYL6m1fA#0

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