k3-6.18: make BeagleBadge e-ink overlay patch apply on all branches - #10392
Conversation
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>
📝 WalkthroughWalkthroughThe 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. ChangesBeagleBadge e-paper support
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
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 winEnsure
CONFIG_DRM_PANEL_SSD16XXis enabled in both target kernel configs.
gooddisplay,gdey042t81requirespanel-ssd16xxfromCONFIG_DRM_PANEL_SSD16XX, and this patch only adds the device-tree compatible string. Set it toyor build it asmin both PSDK 12.00.00.07 andti-linux-6.18.y, then verify thepanel-ssd16xxmodule 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
📒 Files selected for processing (1)
patch/kernel/archive/k3-6.18/0003-arm64-dts-ti-add-BeagleBadge-GDEY042T81-overlay.patch
Problem
kernel-k3-vendor-rt(e.g.BOARD=beaglebadge BRANCH=vendor-rt) fails patching:Root cause
The k3 branches pull different kernel snapshots, and each names/places the BeagleBadge board differently in
arch/arm64/boot/dts/ti/Makefile:vendor/vendor-rtk3-am62l3-badge.dtb(before the# Boards…comment)edge/vendor-edgek3-am62l3-beaglebadge.dtb(after the comment)The original patch anchored on
k3-am62l3-badge.dtb(worked on the tag), and #10380 re-anchored onk3-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.dtbothere. 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 botharch/arm64/boot/dts/ti/Makefiles:The
.dtsopayload is unchanged; only the Makefile hunk anchor moved.Summary by CodeRabbit