fix(sunxi-6.18): drop r-spi backport now merged in linux-6.18.y stable by igorpecovnik · Pull Request #9883 · armbian/build

igorpecovnik · May 23, 2026

Summary

The backport patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch (upstream commit fb20ccf70cf6 by Chen-Yu Tsai, Feb 17 2026) was absorbed into the linux-6.18.y stable tree.
Its hunks now conflict with code already present in drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c upstream — r_spi_parents, r_spi_clk, and the CLK_R_SPI / CLK_BUS_R_SPI table entries are all there.

Result: every kernel-sunxi-current / kernel-sunxi64-current build now fails at patching:

Failed to apply patch .../patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch
Summary: kernel patching: 518 total patches; 517 applied; 1 failed_apply

Drop the now-redundant backport.

Test plan

./compile.sh BOARD=<any-sunxi-board> BRANCH=current KERNEL_ONLY=yes completes the patch step cleanly
Resulting kernel still binds the r-spi clock at boot on A523/T527 hardware (sanity check on any sun55i-a523/t527 board)

Summary by CodeRabbit

Bug Fixes
- Added missing SPI module clock support for sun55i-a523-r platform, enabling proper clock selection and gating for SPI functionality.
Chores
- Updated kernel patch configuration by removing several previously applied patch entries from the build system.

The backport patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_ r-spi_module_clock.patch (upstream commit fb20ccf70cf6 by Chen-Yu Tsai) has been absorbed into the linux-6.18.y stable tree. The hunks now conflict with code that is already present in drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c, causing: Failed to apply patch .../patches.backports/31-clk_sunxi-ng_sun55i-a523-r _Add_missing_r-spi_module_clock.patch Summary: 518 total patches; 517 applied; 1 failed_apply which breaks every kernel-sunxi-current and kernel-sunxi64-current build. Verified against linux-6.18.y via gregkh/linux mirror: r_spi_parents, r_spi_clk, and the CLK_R_SPI / CLK_BUS_R_SPI table entries are already defined upstream. The backport is now redundant; remove it.

coderabbitai · May 23, 2026

📝 Walkthrough

Walkthrough

This patch adds a missing r-spi module clock to the sun55i-a523-r Sunxi-NG CCU clock driver. The new clock definition includes parent clock options, dual-divider/mux/gate register parameters, and is integrated into the driver's clock arrays and exposed via the CLK_R_SPI identifier for use by other kernel subsystems.

Changes

sun55i-a523-r r-spi clock support

Layer / File(s)	Summary
r-spi clock definition and driver registration `patch/kernel/archive/sunxi-6.18/patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch`	Defines `r_spi_parents` parent-clock table and `r-spi` dual-div/mux/gate clock with specific register field mappings, registers the clock in the `sun55i_a523_r_ccu_clks` array, and adds `CLK_R_SPI` onecell mapping entry for clock lookup.
Remove patch entry from series list `patch/kernel/archive/sunxi-6.18/series.conf`	Removes the `patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch` entry from the sunxi-6.18 series file.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

Ready to merge

Suggested reviewers

pyavitz
chraac
janprunk
krachlatte
teknoid
AGM1968
TheSnowfield
PanderMusubi
JohnTheCoolingFan
Tonymac32
sgjava

Poem

🐰 I patched a clock that used to hide,
Now r‑spi ticks in driver stride.
Through mux and div and gated gate,
The bus can spin at proper rate.
Hooray — the kernel keeps good time!

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately summarizes the main change: dropping a redundant r-spi backport patch that was merged into the stable kernel, resolving build failures.
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.

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

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch fix/sunxi-6.18-drop-merged-a523-r-spi-backport

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

Follow-up to previous commit: also remove the now-deleted patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch entry from series.conf so the patcher does not look for a missing file.

igorpecovnik added the Build Executing build train (permission needed) label May 23, 2026

igorpecovnik requested review from AGM1968, JohnTheCoolingFan, PanderMusubi, TheSnowfield, Tonymac32, chraac, janprunk, krachlatte, pyavitz, schwar3kat, sgjava and teknoid as code owners May 23, 2026 22:45

github-actions Bot added size/medium PR with more then 50 and less then 250 lines 05 Milestone: Second quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels May 23, 2026

fix(sunxi-6.18): drop r-spi backport from series.conf

db4ea4d

Follow-up to previous commit: also remove the now-deleted patches.backports/31-clk_sunxi-ng_sun55i-a523-r_Add_missing_r-spi_module_clock.patch entry from series.conf so the patcher does not look for a missing file.

igorpecovnik mentioned this pull request May 23, 2026

fix(sm8550-6.18): drop broken sm8x50 UHS-I/xo-clock mbox patch #9884

Merged

2 tasks

igorpecovnik merged commit c264779 into main May 23, 2026
51 of 52 checks passed

igorpecovnik deleted the fix/sunxi-6.18-drop-merged-a523-r-spi-backport branch May 23, 2026 22:55

igorpecovnik mentioned this pull request May 23, 2026

fix(sm8550-7.0): drop merged & broken SD/DSI patches #9885

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(sunxi-6.18): drop r-spi backport now merged in linux-6.18.y stable - #9883

fix(sunxi-6.18): drop r-spi backport now merged in linux-6.18.y stable#9883
igorpecovnik merged 2 commits into
mainarmbian/build:mainfrom
fix/sunxi-6.18-drop-merged-a523-r-spi-backportarmbian/build:fix/sunxi-6.18-drop-merged-a523-r-spi-backportCopy head branch name to clipboard

igorpecovnik commented May 23, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented May 23, 2026 •

edited

Loading

Walkthrough

Changes

Estimated code review effort

Suggested labels

Suggested reviewers

Poem

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

Search code, repositories, users, issues, pull requests...

Uh oh!

Uh oh!

Conversation

igorpecovnik commented May 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented May 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Suggested labels

Suggested reviewers

Poem

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

1 participant

igorpecovnik commented May 23, 2026 •

edited

Loading

coderabbitai Bot commented May 23, 2026 •

edited

Loading