Skip to content

rockchip64: bump edge to 6.19; current 6.12 -> 6.18#9067

Merged
rpardini merged 31 commits intoarmbian:mainfrom
EvilOlaf:rk-6.19
Jan 6, 2026
Merged

rockchip64: bump edge to 6.19; current 6.12 -> 6.18#9067
rpardini merged 31 commits intoarmbian:mainfrom
EvilOlaf:rk-6.19

Conversation

@EvilOlaf
Copy link
Member

@EvilOlaf EvilOlaf commented Dec 14, 2025

Description

disable a few patches
align a few patches
rewrite all patches
temporary changed MAINLINE_KERNEL_SOURCE because stable always lacks a day behind

How Has This Been Tested?

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

    • Kernel edge bumped to 6.19; broad Rockchip board enablement (many new/updated board DTs), audio codecs and simple-audio-cards, display/VOP wiring, PCIe and SATA enablement, USB‑C/DP alt‑mode and Type‑C role switching, PWM‑fan and thermal maps, RT5651 audio, Mali GPU power wiring.
  • Bug Fixes

    • Stability and peripheral fixes: PMIC/regulator tuning, PCIe/EP wiring and bus delays, Ethernet/PHY timing, USB OTG/host mode, SD/MMC speed/voltage, LED trigger behavior, SPI flash timing.

✏️ Tip: You can customize this high-level summary in your review settings.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 14, 2025

📝 Walkthrough

Walkthrough

Bumps rockchip64 "edge" kernel from 6.18 → 6.19, adds a rockchip64-6.19 kernel patching config, introduces many board/device-tree patches and new DTS files across RK3308/RK3328/RK3399/RK3566 families, updates mainline RC selection logic, and tweaks spidev ID table.

Changes

Cohort / File(s) Summary
Kernel family config
\config/sources/families/include/rockchip64_common.inc``
Updated KERNEL_MAJOR_MINOR for the rockchip64 "edge" branch from 6.186.19.
Mainline selection logic
\config/sources/mainline-kernel.conf.sh``
Updated RC tag selection (uses tag:v6.19-rc3) and added function that sets KERNELSOURCE to Linus repository when that RC is selected.
Patching metadata
\patch/kernel/archive/rockchip64-6.19/0000.patching_config.yaml``
New patch series config for rockchip64-6.19 describing branch, DTS/overlay copy rules, Makefile auto-patching and do-not-commit helpers.
spidev tweak
\patch/kernel/archive/rockchip64-6.19/drv-spi-spidev-remove-warnings.patch``
Inserted new spidev ID entries ("spi-dev" / "armbian,spi-dev") into static driver ID tables.
New patch set: board/device-tree patches
\patch/kernel/archive/rockchip64-6.19/board-.patch``
Many board-specific DTS patches: add/modify regulators, PMIC properties, PCIe/USB/Type-C/DP wiring, GPIO/pinctrl updates, audio nodes, PWM fan/thermal trips, LED triggers, SD/MMC tweaks, DDR timing includes, and ep-gpios changes.
New DTS files (many boards)
\patch/kernel/archive/rockchip64-6.19/dt/*.dts``
Added numerous full board DTS files for RK3308/RK3318/RK3328/RK3399/RK3566 families (power/regulator trees, OPP/DMC timing, pinctrl, peripherals, thermal and PMIC wiring).
Board-level small fixes
\patch/kernel/archive/rockchip64-6.19/* (various)``
Multiple small edits across DTS: vmmc-supply swaps, sdmmc capability adjustments, sata/PCIe properties, gpio-line-names additions, SPI flash speed change, bus-scan-delay additions, and minor property insertions/removals.

Sequence Diagram(s)

(omitted)

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~70 minutes

Possibly related PRs

Suggested reviewers

  • JohnTheCoolingFan
  • brentr
  • prahal
  • krachlatte
  • lanefu
  • ahoneybun
  • amazingfate
  • igorpecovnik
  • catalinii
  • paolosabatino

Poem

🐰
I hopped from patch to DTS with glee,
Pushed voltages, clocks, and PCIe,
Fans spin, LEDs softly glow,
Boards wake where quiet data flow,
A rabbit’s cheer for kernel 6.19, whee!

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Title check ✅ Passed The title 'rockchip64: bump edge to 6.19; current 6.12 -> 6.18' is clear and specific, directly conveying the main objective of updating kernel versions for two release branches.
✨ Finishing touches
  • 📝 Generate docstrings

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 14, 2025
@amazingfate
Copy link
Contributor

Is it possible to list all the deleted patches so we can continue working on them? I can't find media-0001 rkvdec patches now.

@EvilOlaf
Copy link
Member Author

Yes, I did my work step by step and commited inbetween to make it easier to get such info: 12aeef4

EvilOlaf and others added 22 commits January 6, 2026 21:33
- The deleted patch is not necessary because rkvdec patch v7 has removed
h264 sps check at start. And future version of chromium can also get rid
of the issue that patch has fixed.
- rpardini: squash with removal of v5
- hopefully I got them all
- not `rk3528-01-arm64-dts-rockchip-Add-PCIe-Gen2x1-controller-for-RK` as that was a 6.19 backport
… regulator

- I've submitted upstream, and got feedback ref the always-on.
- See https://lore.kernel.org/linux-rockchip/20260101-arm64-dts-rockchip-rk3588-npu-enablements-v2-0-013cf5d5c39d@pardini.net
- update: merged to linux-rockchip for-next, should land in 6.20/7.0
@rpardini
Copy link
Member

rpardini commented Jan 6, 2026

-rc4 bump


  • 🌱 rockchip64-6.19: copy patches from 6.18
  • 🌿 rockchip64-6.19: update patching-config for 6.19
  • 🍃 rockchip64_common: bump edge 6.18 -> 6.19, current 6.12 -> 6.18
  • 🍀 rockchip64-6.19: rk3399-orangepi-4-lts: fix "disable" -> "disabled"
  • 🐸 rockchip64-6.19: rk3328-nanopi-neo3-rev02: fix "pinctl-0" -> "pinctrl-0"
  • 🌳 rockchip64-6.19: rk3399-am40: fix typo in dts
  • 🌴 rockchip64-6.19: rk3328-dusun-dsom-010r: fix typo in dts
  • 🌵 rockchip64-6.19: rk3399-fine3399: remove duplicate &gpu node from dts
  • 🌱 rockchip64-6.19: fix patch name typo "mail" -> "mali"
  • 🌿 rockchip64-6.19: rock-3a: fix wrong gpio descriptions
  • 🍃 rockchip64-6.19: rock-s0: fix typo in patch subject
  • 🍀 rockchip64-6.19: rk3328-roc-cc-enable-dms: fix opp-microvolt settings
    • fix Rabbit's mess
  • 🐸 rockchip64-6.19: drop partially upstreamed general-driver-tm16xx-led-driver
  • 🌳 rockchip64-6.19: disable broken general-add-panel-simple-dsi
  • 🌴 rockchip64-6.19: disable broken rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT
  • 🌵 rockchip64-6.19: disable broken rk3308-0001-pinctrl-slew-mux
  • 🌱 rockchip64-6.19: disable broken rk3308-fix-10mbit-ethernet
  • 🌿 rockchip64-6.19: disable broken rk3308-acodec-vendor-driver
  • 🍃 rockchip64-6.19: fix general-rt5651-add-mclk
  • 🍀 rockchip64-6.19: fix net-ethernet-realtek-add-r8169-LED-configuration-from-OF
  • 🐸 rockchip64-6.19: fix general-v4l2-iep-driver (IEP driver)
  • 🌳 rockchip64-6.19: add rkvdec v7 patches
    • The deleted patch is not necessary because rkvdec patch v7 has removed h264 sps check at start. And future version of chromium can also get rid of the issue that patch has fixed.
    • rpardini: squash with removal of v5
  • 🌴 rockchip64-6.19: re-copy dt/ changed from 6.18 since 6.19 bump started
    • hopefully I got them all
  • 🌵 rockchip64-6.19: re-copy overlay/ changed from 6.18 since 6.19 bump started
    • hopefully I got them all
  • 🌱 rockchip64-6.19: re-copy patches added to 6.18 since 6.19 bump started
    • hopefully I got them all
    • not rk3528-01-arm64-dts-rockchip-Add-PCIe-Gen2x1-controller-for-RK as that was a 6.19 backport
  • 🌿 rockchip64-6.19: rewrite against 6.19-rc3
  • 🍃 rockchip64-6.19: update rk3588 NPU patches; remove always-on from NPU regulator
  • 🍀 mainline-kernel: bump 6.19 to 6.19-rc4
  • 🐸 rockchip64-6.19: Enable audio for HDMI0 on station-m3 (repick from 6.18)
  • 🌳 rockchip64-6.19: drop mainline-overwriting DT rk3568-9tripod-x3568-v4
  • 🌴 rockchip64-6.19: rewrite against 6.19-rc4

@rpardini rpardini merged commit 63192a5 into armbian:main Jan 6, 2026
1 check passed
@EvilOlaf EvilOlaf deleted the rk-6.19 branch January 7, 2026 06:59
yury-deltsov pushed a commit to yury-deltsov/build that referenced this pull request Feb 8, 2026
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.

7 participants