Skip to content

rockchip64: Drop upstreamed i2s-tdm patch#9444

Merged
igorpecovnik merged 1 commit intoarmbian:mainfrom
retro98boy:rockchip64-kernel-build-fix
Feb 28, 2026
Merged

rockchip64: Drop upstreamed i2s-tdm patch#9444
igorpecovnik merged 1 commit intoarmbian:mainfrom
retro98boy:rockchip64-kernel-build-fix

Conversation

@retro98boy
Copy link
Copy Markdown
Contributor

@retro98boy retro98boy commented Feb 28, 2026

Description

The rk3308-i2s-default-rate.patch has been merged into the upstream of versions 6.18.y and 6.19.y

6.18.14: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.18.y&id=9fbb4f14462f0830516694dc7ea7be5d70e6ca3b

6.19.4: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.19.y&id=f8e4d41dc66790f6585e731c68a91bbe0af77c96

GitHub issue reference: #9443

Jira reference number: AR-2822

How Has This Been Tested?

./compile.sh kernel BOARD=smart-am40 BRANCH=current RELEASE=noble

./compile.sh kernel BOARD=smart-am40 BRANCH=edge RELEASE=noble

Summary by CodeRabbit

  • Revert
    • Removed automatic default clock rate assignment for Rockchip RK3308 I2S audio devices.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Feb 28, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Jira integration is disabled

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 12f4e9f and 7ed434c.

📒 Files selected for processing (2)
  • patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch
  • patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch
💤 Files with no reviewable changes (2)
  • patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch
  • patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch

📝 Walkthrough

Walkthrough

This PR removes default MCLK rate handling from two rockchip64 kernel I2S patches (versions 6.18 and 6.19). The removed code previously provided fallback clock rate configuration when set_sysclk was not invoked in rockchip_i2s_tdm_hw_params.

Changes

Cohort / File(s) Summary
Rockchip I2S Default Rate Removal
patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch, patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch
Removed DEFAULT_MCLK_FS definition (256) and associated fallback logic that set default master clock rates in rockchip_i2s_tdm_hw_params when set_sysclk was not called. Includes removal of conditional mclk_rate assignment and clk_set_rate call with error handling.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Poem

🐰 Whiskers twitching, a cleanup so fine,
Two patches removed, time to align,
Default rates gone, the code now runs light,
Simpler and cleaner—oh, what a delight! 🎉

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: removing local patches that have been merged upstream into Linux stable branches.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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 02 Milestone: First quarter release size/medium PR with more then 50 and less then 250 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Feb 28, 2026
@github-actions github-actions bot added the Ready to merge Reviewed, tested and ready for merge label Feb 28, 2026
@github-actions
Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions bot removed the Needs review Seeking for review label Feb 28, 2026
@igorpecovnik igorpecovnik merged commit 54ade91 into armbian:main Feb 28, 2026
12 checks passed
@retro98boy retro98boy deleted the rockchip64-kernel-build-fix branch February 28, 2026 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines

Development

Successfully merging this pull request may close these issues.

3 participants