Orangepi-5-max: Remove upstreamed patches and use mainline bluetooth.#9673
Merged
igorpecovnik merged 2 commits intoarmbian:mainfrom Apr 15, 2026
Merged
Orangepi-5-max: Remove upstreamed patches and use mainline bluetooth.#9673igorpecovnik merged 2 commits intoarmbian:mainfrom
igorpecovnik merged 2 commits intoarmbian:mainfrom
Conversation
fbernier
requested review from
ColorfulRhino,
HeyMeco,
JohnTheCoolingFan,
SuperKali,
TheSnowfield,
Tonymac32,
ahoneybun,
amazingfate,
brentr,
catalinii,
chainsx,
efectn,
igorpecovnik,
joekhoobyar,
krachlatte,
lanefu,
paolosabatino,
prahal,
pyavitz,
rpardini and
schwar3kat
as code owners
Contributor
📝 WalkthroughWalkthroughThe PR updates Orange Pi 5 Max board tweaks: it prevents enabling the Bluetooth service on the "edge" branch and adds a symlink for Broadcom firmware lookup on edge kernels. It also removes two device-tree patches that added a second HDMI connector and enabled HDMI audio/I2S nodes. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
github-actions
bot
added
size/medium
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
config/boards/orangepi5-max.csc (1)
86-87: Use/lib/firmware/updates/for the board-specific firmware override symlink.At Line 86-87, placing the symlink directly in
/lib/firmware/brcmcan conflict with package-managed firmware contents. Prefer/lib/firmware/updates/brcmfor overrides.Based on learnings: In the Armbian build system, when copying firmware files during family_tweaks_s(), use /lib/firmware/updates/ instead of /lib/firmware/ to avoid conflicts with the Armbian firmware package.♻️ Proposed change
- mkdir -p "$SDCARD/lib/firmware/brcm" - ln -sf SYN43711A0.hcd "$SDCARD/lib/firmware/brcm/BCM.xunlong,orangepi-5-max.hcd" + mkdir -p "$SDCARD/lib/firmware/updates/brcm" + ln -sf ../../brcm/SYN43711A0.hcd "$SDCARD/lib/firmware/updates/brcm/BCM.xunlong,orangepi-5-max.hcd"🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@config/boards/orangepi5-max.csc` around lines 86 - 87, Change the firmware override path from /lib/firmware/brcm to the updates directory: create the updates directory (mkdir -p "$SDCARD/lib/firmware/updates/brcm") and place the board-specific symlink there (ln -sf SYN43711A0.hcd "$SDCARD/lib/firmware/updates/brcm/BCM.xunlong,orangepi-5-max.hcd") so the override won’t conflict with package-managed firmware; update the mkdir and ln calls in the same block that currently uses "$SDCARD/lib/firmware/brcm".
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@config/boards/orangepi5-max.csc`:
- Around line 86-87: Change the firmware override path from /lib/firmware/brcm
to the updates directory: create the updates directory (mkdir -p
"$SDCARD/lib/firmware/updates/brcm") and place the board-specific symlink there
(ln -sf SYN43711A0.hcd
"$SDCARD/lib/firmware/updates/brcm/BCM.xunlong,orangepi-5-max.hcd") so the
override won’t conflict with package-managed firmware; update the mkdir and ln
calls in the same block that currently uses "$SDCARD/lib/firmware/brcm".
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: d2054146-82fa-446e-bfa0-7d3f5de9ebcf
📒 Files selected for processing (3)
config/boards/orangepi5-max.cscpatch/kernel/archive/rockchip64-7.0/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patchpatch/kernel/archive/rockchip64-7.0/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
💤 Files with no reviewable changes (2)
- patch/kernel/archive/rockchip64-7.0/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
- patch/kernel/archive/rockchip64-7.0/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch
The AP6611S BT chip is supported natively by the mainline hci_bcm SerDev driver on the edge kernel (Linux 7.0). The upstream DTS already provides the full bluetooth node in rk3588-orangepi-5-compact.dtsi; no kernel patches needed. - Skip enabling ap6611s-bluetooth.service on edge (userspace patchram would conflict with hci_bcm both claiming /dev/ttyS7) - Create BCM.xunlong,orangepi-5-max.hcd -> SYN43711A0.hcd firmware symlink so hci_bcm finds the firmware by compatible-string-derived name
Patches 1100 (2nd HDMI) and 1101 (HDMI sound) are now fully covered by the upstream Linux 7.0 DTS, which was refactored to use rk3588-orangepi-5-compact.dtsi. The patches no longer apply and were silently skipped during builds.
Contributor
|
✅ This PR has been reviewed and approved — all set for merge! |
github-actions
bot
added
Ready to merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
GitHub issue reference:
Jira reference number [AR-9999]
Documentation summary for feature / change
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
Checklist:
Please delete options that are not relevant.
Summary by CodeRabbit
Bug Fixes
Revert