mainline: bump to 7.1-rc6#9922
Merged
Merged
Conversation
EvilOlaf
requested review from
ColorfulRhino,
HeyMeco,
JohnTheCoolingFan,
SuperKali,
TheSnowfield,
Tonymac32,
ahoneybun,
amazingfate,
brentr,
catalinii,
chainsx,
efectn,
iav,
igorpecovnik,
joekhoobyar,
krachlatte,
lanefu,
paolosabatino,
prahal,
pyavitz,
rpardini and
schwar3kat
as code owners
Contributor
📝 WalkthroughWalkthroughThis PR updates kernel sources and patches for Armbian's Rockchip-based boards: bumps the mainline kernel release candidate to v7.1-rc6, adds RT5651 audio support for NanoPi M4V2, configures PCIe bus-scan delays, fixes USB Type-C capability registration edge cases, and introduces RK3528 USB2 PHY support with proper cleanup. ChangesRockchip Kernel Patches and Configuration
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 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
08
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (4)
patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch (3)
113-119:⚠️ Potential issue | 🔴 Critical | ⚡ Quick winDuplicate
&hdmi_soundnode will cause device-tree issues.Lines 113-115 show the existing
&hdmi_sound { status = "okay"; }node in context, then lines 117-119 add an identical duplicate. This will either cause a DTC warning/error or result in unpredictable merge behavior depending on the device-tree compiler version.Remove the duplicate addition.
Proposed fix
&hdmi_sound { status = "okay"; }; - -&hdmi_sound { - status = "okay"; -};🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch` around lines 113 - 119, There is a duplicate device-tree node for &hdmi_sound being added; remove the redundant block so only a single &hdmi_sound { status = "okay"; } remains (delete the added duplicate &hdmi_sound {...} stanza introduced in the patch) to avoid DTC warnings/errors and merge conflicts when compiling the device tree.
163-167:⚠️ Potential issue | 🔴 Critical | ⚡ Quick winWrong properties:
&spdifnode has I2C timing properties.The
i2c-scl-rising-time-nsandi2c-scl-falling-time-nsproperties are specific to I2C controllers and are not valid for an SPDIF interface. This appears to be a copy-paste error from the I2C configuration.Either remove these properties or replace them with appropriate SPDIF configuration.
Proposed fix
&spdif { - i2c-scl-rising-time-ns = <450>; - i2c-scl-falling-time-ns = <15>; status = "okay"; };🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch` around lines 163 - 167, The &spdif node incorrectly contains I2C-specific properties i2c-scl-rising-time-ns and i2c-scl-falling-time-ns; remove those two properties from the &spdif node (or if SPDIF-specific settings are required, replace them with valid SPDIF properties such as status, compatible, clocks, clock-names, or phandle references) so the SPDIF node only contains valid SPDIF configuration and status = "okay".
141-153:⚠️ Potential issue | 🔴 Critical | ⚡ Quick winDuplicate
&i2s2node will cause device-tree issues.Lines 141-143 show the existing
&i2s2 { status = "okay"; }in context, then lines 151-153 add an identical duplicate. Same issue as the&hdmi_soundduplication.Remove the duplicate
&i2s2addition.Proposed fix
&i2s1 { rockchip,playback-channels = <8>; rockchip,capture-channels = <8>; status = "okay"; }; - -&i2s2 { - status = "okay"; -};🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch` around lines 141 - 153, The patch introduces a duplicate &i2s2 node which will break the device tree; remove the second &i2s2 { status = "okay"; } block so only a single &i2s2 node remains, and keep the new &i2s1 block (rockchip,playback-channels/capture-channels and status) as the intended addition; ensure there is no duplicate &i2s2 entry after your edit.patch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch (1)
91-94:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winTypo in user-facing warning message: "compatiple" → "compatible".
The
dev_warnmessage contains a typo that will appear in kernel logs.📝 Proposed fix
- /* Make sure we have compatiple pin configurations */ + /* Make sure we have compatible pin configurations */🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@patch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch` around lines 91 - 94, The dev_warn message in the Alt-DP compatibility check contains a typo ("compatiple"); update the warning string in the block that checks if (!(port_pins & alt_pins)) so it reads "compatible" instead of "compatiple" — modify the dev_warn call that references alt->dev and prints port->vdo, alt->vdo, port_pins, alt_pins to correct the spelling in the user-facing message.
🧹 Nitpick comments (1)
patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch (1)
129-137: 💤 Low valueMinor: Remove commented-out debug line.
The
// spk-con-gpioline at line 135 appears to be a leftover from development. Either enable it if needed or remove it to keep the device-tree clean.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch` around lines 129 - 137, Remove the leftover commented debug line inside the rt5651 node: delete the "// spk-con-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;" entry within the rt5651: rt5651@1a block (or, if the speaker control is required, replace it with a valid, uncommented property using the correct DTS property name spk-con-gpio and proper syntax). Ensure only the intended properties (compatible, reg, clocks, clock-names, hp-det-gpio, `#sound-dai-cells`) remain in the rt5651 node.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In
`@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch`:
- Around line 113-119: There is a duplicate device-tree node for &hdmi_sound
being added; remove the redundant block so only a single &hdmi_sound { status =
"okay"; } remains (delete the added duplicate &hdmi_sound {...} stanza
introduced in the patch) to avoid DTC warnings/errors and merge conflicts when
compiling the device tree.
- Around line 163-167: The &spdif node incorrectly contains I2C-specific
properties i2c-scl-rising-time-ns and i2c-scl-falling-time-ns; remove those two
properties from the &spdif node (or if SPDIF-specific settings are required,
replace them with valid SPDIF properties such as status, compatible, clocks,
clock-names, or phandle references) so the SPDIF node only contains valid SPDIF
configuration and status = "okay".
- Around line 141-153: The patch introduces a duplicate &i2s2 node which will
break the device tree; remove the second &i2s2 { status = "okay"; } block so
only a single &i2s2 node remains, and keep the new &i2s1 block
(rockchip,playback-channels/capture-channels and status) as the intended
addition; ensure there is no duplicate &i2s2 entry after your edit.
In
`@patch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch`:
- Around line 91-94: The dev_warn message in the Alt-DP compatibility check
contains a typo ("compatiple"); update the warning string in the block that
checks if (!(port_pins & alt_pins)) so it reads "compatible" instead of
"compatiple" — modify the dev_warn call that references alt->dev and prints
port->vdo, alt->vdo, port_pins, alt_pins to correct the spelling in the
user-facing message.
---
Nitpick comments:
In
`@patch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patch`:
- Around line 129-137: Remove the leftover commented debug line inside the
rt5651 node: delete the "// spk-con-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;"
entry within the rt5651: rt5651@1a block (or, if the speaker control is
required, replace it with a valid, uncommented property using the correct DTS
property name spk-con-gpio and proper syntax). Ensure only the intended
properties (compatible, reg, clocks, clock-names, hp-det-gpio, `#sound-dai-cells`)
remain in the rt5651 node.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: c12c8cd4-11b3-498d-9109-d3dfb73cc5da
📒 Files selected for processing (9)
config/sources/mainline-kernel.conf.shpatch/kernel/archive/rockchip64-7.1/board-nanopi-m4v2-dts-add-sound-card.patchpatch/kernel/archive/rockchip64-7.1/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patchpatch/kernel/archive/rockchip64-7.1/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patchpatch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patchpatch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patchpatch/kernel/archive/rockchip64-7.1/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patchpatch/kernel/archive/rockchip64-7.1/rk3528-10-phy-rockchip-inno-usb2-Add-support-for-RK3528.patchpatch/kernel/archive/rockchip64-7.1/rk3528-13-phy-rockchip-inno-usb2-fix-otg-timer-cleanup.patch
igorpecovnik
approved these changes
Jun 1, 2026
Contributor
|
✅ This PR has been reviewed and approved — all set for 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
2 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
How Has This Been Tested?
Checklist:
Please delete options that are not relevant.
Summary by CodeRabbit
New Features
Bug Fixes
Chores