Skip to content

Fix sata2 target-supply for Orange Pi 3B and Station M2#10137

Open
dust-7 wants to merge 1 commit into
armbian:mainfrom
dust-7:sata2
Open

Fix sata2 target-supply for Orange Pi 3B and Station M2#10137
dust-7 wants to merge 1 commit into
armbian:mainfrom
dust-7:sata2

Conversation

@dust-7

@dust-7 dust-7 commented Jul 7, 2026

Copy link
Copy Markdown
Member

Description

The sata2 node for rk356x has changed in kernel 7.1 (see kernel commit 5918bf2). Update patches and migrate target-supply based on change.

How Has This Been Tested?

Tested on Orange Pi 3B:

  1. Build fresh edge image.
  2. Enable rockchip-rk3566-sata2.dtbo. After restart, lsblk does not detect sata SSD.
  3. Update patches (per this PR) and rebuild DTB with ./compile.sh kernel-dtb BOARD=orangepi3b BRANCH=edge.
  4. After .deb install and restart, lsblk now detects sata SSD.

Not tested on Station M2.

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

Summary by CodeRabbit

  • New Features

    • Added support for an onboard status LED with a heartbeat indicator.
    • Added headset detection support and improved SD card, USB, Bluetooth, and serial hardware handling.
  • Bug Fixes

    • Improved SATA SSD reliability, especially when PCIe is disabled.
    • Updated power and pin assignments to better match supported hardware, helping prevent storage and peripheral issues.

The sata2 node for rk356x has changed in kernel 7.1 (see kernel commit 5918bf2). Update patches and migrate target-supply based on change.
@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Updates duplicated Rockchip device-tree patches across rockchip64-7.1 and rockchip64-7.2 kernel archives: an Orangepi 3B patch wires SATA2's target-supply via a new sata2_port0 node, and a Station M2 (rk3566-roc-pc) patch adds LED/headset nodes, GPIO/pinctrl reassignments, thermal trip, storage/SATA/UART/USB changes, and removes i2c1/i2c2/i2c3 blocks.

Changes

Rockchip64 kernel patch updates (7.1 and 7.2)

Layer / File(s) Summary
Orangepi 3B SATA2 target-supply fix
patch/kernel/archive/rockchip64-7.1/board-orangepi3b-...sata2.patch, patch/kernel/archive/rockchip64-7.2/board-orangepi3b-...sata2.patch
Adds a sata2_port0 node and assigns target-supply = <&vcc3v3_pcie30>, replacing the prior association under &sata2.
Station M2: LED, headset, and thermal additions
patch/kernel/archive/rockchip64-7.1/board-station-m2.patch, patch/kernel/archive/rockchip64-7.2/board-station-m2.patch
Adds a firefly-led/led-firefly node with heartbeat trigger, a headset GPIO/ADC node, a cpu_hot thermal trip, and supporting firefly_led_enable_h/hp-det pinctrl groups.
Station M2: USB power GPIO reassignment and host/PHY enablement Switches USB regulator enable GPIOs from RK_PC5/RK_PC6 to RK_PA6/RK_PA5, renames related pinctrl labels, and enables usb2phy1_host, usb_host1_ehci, usb_host1_ohci.
Station M2: i2c removal and Bluetooth/pinctrl remap Removes i2c1, i2c2, i2c3 enable/status blocks and updates Bluetooth pinctrl GPIO pad/mux assignments.
Station M2: SARADC, storage, SATA, and UART updates Enables saradc with vref-supply, extends sdmmc1 (disable-wp, non-removable, extra pinctrl) and adds sdmmc2, wires sata2_port0 target-supply to vcc3v3_pcie, and adds uart1m0_rtsn to uart1 pinctrl.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Possibly related PRs

  • armbian/build#9435: Both PRs modify the Rockchip RK3566 device tree to wire SATA2's target-supply for the same SATA2 power-supply configuration.

Suggested labels: BSP

Suggested reviewers: ColorfulRhino, HeyMeco, JohnTheCoolingFan, TheSnowfield, Tonymac32

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: fixing the SATA2 target-supply on Orange Pi 3B and Station M2.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

@github-actions github-actions Bot added 08 Milestone: Third quarter release size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Jul 7, 2026
@EvilOlaf

EvilOlaf commented Jul 7, 2026

Copy link
Copy Markdown
Member

Is this relevant for current (rockchip64-6.18)?

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 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.

Inline comments:
In `@patch/kernel/archive/rockchip64-7.1/board-station-m2.patch`:
- Around line 212-214: The added SATA supply reference uses a non-existent node
label, so update the change to point at the existing SATA node used in this
tree. Adjust the DTS fragment around the sata2 target to reference the real
RK356x SATA label or port subnode instead of sata2_port0, keeping the
target-supply assignment to vcc3v3_pcie unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 7cb8dbea-3bc3-42ff-897d-dfea9fd59ad3

📥 Commits

Reviewing files that changed from the base of the PR and between d0e92d1 and b8e5138.

📒 Files selected for processing (4)
  • patch/kernel/archive/rockchip64-7.1/board-orangepi3b-0002-specify-target-supply-for-sata2.patch
  • patch/kernel/archive/rockchip64-7.1/board-station-m2.patch
  • patch/kernel/archive/rockchip64-7.2/board-orangepi3b-0002-specify-target-supply-for-sata2.patch
  • patch/kernel/archive/rockchip64-7.2/board-station-m2.patch

Comment thread patch/kernel/archive/rockchip64-7.1/board-station-m2.patch
@dust-7

dust-7 commented Jul 7, 2026

Copy link
Copy Markdown
Member Author

@chainsx I took the liberty to update the Station M2 patch, as the changes are similar. FYI.

@dust-7

dust-7 commented Jul 7, 2026

Copy link
Copy Markdown
Member Author

Is this relevant for current (rockchip64-6.18)?

Nope, since the change is introduced in kernel 7.1.

@EvilOlaf

EvilOlaf commented Jul 7, 2026

Copy link
Copy Markdown
Member

Nope, since the change is introduced in kernel 7.1.

could have been backported 🤷

@dust-7

dust-7 commented Jul 8, 2026

Copy link
Copy Markdown
Member Author

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

Labels

08 Milestone: Third quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/small PR with less then 50 lines

Development

Successfully merging this pull request may close these issues.

2 participants