Skip to content

imx93: fix kernel-imx93-current build — drop redundant blk-ctrl.c hunk (6.18.42) - #10331

Merged
igorpecovnik merged 1 commit into
mainfrom
imx93-drop-redundant-blkctrl-hunk
Aug 4, 2026
Merged

imx93: fix kernel-imx93-current build — drop redundant blk-ctrl.c hunk (6.18.42)#10331
igorpecovnik merged 1 commit into
mainfrom
imx93-drop-redundant-blkctrl-hunk

Conversation

@igorpecovnik

@igorpecovnik igorpecovnik commented Aug 4, 2026

Copy link
Copy Markdown
Member

Fixes the kernel-imx93-current failure (run 30825508798):

Failed to apply patch 0001-arm64-dts-freescale-add-MBa93xxLA-MINI-modifications.patch
  Hunk #2 FAILED at 301 (drivers/pmdomain/imx/imx93-blk-ctrl.c)
  1 out of 2 hunks FAILED → failed_apply → build abort

Root cause

The MBa93xxLA-MINI patch adds devm_of_platform_populate() + #include <linux/of_platform.h> to imx93_blk_ctrl_probe() (to probe the added LCDIF sub-node). That change is already upstream — mainline imx93-blk-ctrl.c has the include (line 10) and devm_of_platform_populate(dev) (line 360). On the 6.18.42 base the code is already present, so the hunk conflicts.

Fix

Drop the blk-ctrl.c changes from the patch; keep the DTS additions (imx91_93_common.dtsi LCDIF node + imx93.dtsi), which are still needed and applied cleanly. CI will confirm the patch now applies.

Summary by CodeRabbit

  • New Features

    • Enabled LCD display controller support on compatible i.MX93 boards.
    • Added display bridge connectivity, clock configuration, power management, and endpoint wiring for LCD and LVDS output.
  • Refactor

    • Simplified display support by removing automatic sub-device population and related cleanup logic.

….42)

The MBa93xxLA-MINI patch added devm_of_platform_populate() + an of_platform.h
include to imx93_blk_ctrl_probe() so the added LCDIF sub-node gets probed. That
change is already upstream (mainline imx93-blk-ctrl.c has both), so on the
6.18.42 base the hunk no longer applies and kernel patching fails with
"1 out of 2 hunks FAILED" -> failed_apply -> build abort.

Remove the blk-ctrl.c changes; keep the DTS additions (imx91_93_common.dtsi
LCDIF node + imx93.dtsi), which the base kernel needs and which applied cleanly.

Signed-off-by: Igor Pecovnik <igor@armbian.com>
@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 Aug 4, 2026
@coderabbitai

coderabbitai Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

The patch removes the imx93-blk-ctrl.c change and adds i.MX93 LCDIF and LVDS device-tree configuration, including clocks, power domains, and display endpoints.

Changes

i.MX93 display configuration

Layer / File(s) Summary
LCDIF and LVDS device-tree wiring
patch/kernel/archive/imx93-6.18/0001-arm64-dts-freescale-add-MBa93xxLA-MINI-modifications.patch
The patch adds an LCDIF node with resources, configures LCDIF and media block clocks, adds an LVDS bridge sub-device, and defines display endpoints. Patch metadata removes the previous imx93-blk-ctrl.c modification.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: schmiedelm

🚥 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 identifies the build fix and the removal of the redundant blk-ctrl.c hunk.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch imx93-drop-redundant-blkctrl-hunk

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.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Aug 4, 2026
@igorpecovnik
igorpecovnik merged commit 9c26d23 into main Aug 4, 2026
14 checks passed
@igorpecovnik
igorpecovnik deleted the imx93-drop-redundant-blkctrl-hunk branch August 4, 2026 13:30
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, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines

Development

Successfully merging this pull request may close these issues.

1 participant