Skip to content

k3-6.18: make BeagleBadge e-ink overlay patch apply on all branches - #10392

Merged
igorpecovnik merged 1 commit into
mainfrom
fix/k3-beaglebadge-eink-both-trees
Aug 10, 2026
Merged

k3-6.18: make BeagleBadge e-ink overlay patch apply on all branches#10392
igorpecovnik merged 1 commit into
mainfrom
fix/k3-beaglebadge-eink-both-trees

Conversation

@igorpecovnik

@igorpecovnik igorpecovnik commented Aug 10, 2026

Copy link
Copy Markdown
Member

Problem

kernel-k3-vendor-rt (e.g. BOARD=beaglebadge BRANCH=vendor-rt) fails patching:

0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay: Hunk #1 FAILED at 67
Failed to apply 1 patches

Root cause

The k3 branches pull different kernel snapshots, and each names/places the BeagleBadge board differently in arch/arm64/boot/dts/ti/Makefile:

Branch Kernel Board line
vendor / vendor-rt TI PSDK tag 12.00.00.07 k3-am62l3-badge.dtb (before the # Boards… comment)
edge / vendor-edge ti-linux-6.18.y branch k3-am62l3-beaglebadge.dtb (after the comment)

The original patch anchored on k3-am62l3-badge.dtb (worked on the tag), and #10380 re-anchored on k3-am62l3-beaglebadge.dtb (fixed edge) — so each fix worked for one snapshot and broke the other.

Fix

Anchor the Makefile insertion on the evm overlay entries (…-eqep.dtbo / …-mcan.dtbo / …-pwm.dtbo), which are identical and contiguous in both snapshots, and add the e-ink .dtbo there. It's an overlay, so it belongs in the overlay group anyway — and this avoids the board line that differs between trees entirely.

Verification

Applied with the build's exact command (patch --batch -p1 -N --quoting-style=c) against both arch/arm64/boot/dts/ti/Makefiles:

  • PSDK tag 12.00.00.07 (vendor/vendor-rt): exit 0, no rejects.
  • ti-linux-6.18.y (edge/vendor-edge): exit 0, no rejects (1-line offset).

The .dtso payload is unchanged; only the Makefile hunk anchor moved.

Summary by CodeRabbit

  • New Features
    • Added support for the BeagleBadge GDEY042T81 e-paper display.
    • Enabled display communication and required control signals on compatible TI K3-based boards.
    • The display is now available through the device tree overlay for supported hardware.

The k3 branches use different kernel snapshots that name/place the board
differently in arch/arm64/boot/dts/ti/Makefile:
  - vendor / vendor-rt (TI PSDK tag 12.00.00.07): k3-am62l3-badge.dtb
  - edge / vendor-edge (ti-linux-6.18.y branch):  k3-am62l3-beaglebadge.dtb

The previous anchor (k3-am62l3-beaglebadge.dtb, PR #10380) fixed edge but
broke vendor/vendor-rt (e.g. beaglebadge/vendor-rt: "Hunk #1 FAILED at 67").

Re-anchor the Makefile hunk to the evm overlay entries (…-eqep/mcan/pwm.dtbo),
which are identical and contiguous in both snapshots, and add the eink .dtbo
there. Overlay entry belongs with the other overlays anyway.

Verified with the build's exact command (patch --batch -p1 -N) against both
the PSDK tag 12.00.00.07 and the ti-linux-6.18.y branch Makefiles: applies
clean, no rejects, on both.

Signed-off-by: Igor Pecovnik <igor@armbian.com>
@coderabbitai

coderabbitai Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

The patch adds a BeagleBadge GDEY042T81 e-paper device-tree overlay. It configures SPI0, display control GPIOs, pin multiplexing, and a 2 MHz SPI limit. It also registers the resulting DTBO in the TI K3 build lists.

Changes

BeagleBadge e-paper support

Layer / File(s) Summary
Define the e-paper overlay
patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch
The overlay configures AM62Lx pin groups, enables SPI0, and defines the GDEY042T81 display node with its SPI and GPIO settings.
Register the overlay
patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch
The K3 device-tree build lists include k3-am62l3-badge-eink-gdey042t81.dtbo for the AM62Lx BeagleBadge board.

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

Possibly related PRs

Suggested reviewers: jonaswood01, grippy98

🚥 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 describes the main change: making the BeagleBadge e-ink overlay patch apply across k3-6.18 branches.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/k3-beaglebadge-eink-both-trees

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 size/small PR with less then 50 lines 08 Milestone: Third quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Aug 10, 2026

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch (1)

84-84: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Ensure CONFIG_DRM_PANEL_SSD16XX is enabled in both target kernel configs.

gooddisplay,gdey042t81 requires panel-ssd16xx from CONFIG_DRM_PANEL_SSD16XX, and this patch only adds the device-tree compatible string. Set it to y or build it as m in both PSDK 12.00.00.07 and ti-linux-6.18.y, then verify the panel-ssd16xx module is installed on target.

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

In
`@patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch`
at line 84, Enable CONFIG_DRM_PANEL_SSD16XX as y or m in both the PSDK
12.00.00.07 and ti-linux-6.18.y kernel configurations, and ensure the resulting
panel-ssd16xx module is installed on the target alongside the
gooddisplay,gdey042t81 overlay.
🤖 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.

Outside diff comments:
In
`@patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch`:
- Line 84: Enable CONFIG_DRM_PANEL_SSD16XX as y or m in both the PSDK
12.00.00.07 and ti-linux-6.18.y kernel configurations, and ensure the resulting
panel-ssd16xx module is installed on the target alongside the
gooddisplay,gdey042t81 overlay.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 8408604d-2b28-4fdc-aa67-af72d172b205

📥 Commits

Reviewing files that changed from the base of the PR and between d28c4c8 and 995727c.

📒 Files selected for processing (1)
  • patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Aug 10, 2026
@igorpecovnik
igorpecovnik merged commit 5045232 into main Aug 10, 2026
15 checks passed
@igorpecovnik
igorpecovnik deleted the fix/k3-beaglebadge-eink-both-trees branch August 10, 2026 07:07
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