Skip to content

Retroidpocket: fix current and add edge as target#9724

Open
EvilOlaf wants to merge 2 commits intoarmbian:mainfrom
EvilOlaf:retroid-fix
Open

Retroidpocket: fix current and add edge as target#9724
EvilOlaf wants to merge 2 commits intoarmbian:mainfrom
EvilOlaf:retroid-fix

Conversation

@EvilOlaf
Copy link
Copy Markdown
Member

@EvilOlaf EvilOlaf commented Apr 25, 2026

#9572 moved before as patch added device trees into out of tree device tree files. How this was not done for current, which is kind of odd because 6.19.y was actually never a target for these devices.

Fixes https://forum.armbian.com/topic/59330-compiling-failing-for-sm8250-retroid/#comment-236565

How Has This Been Tested?

  • ./compile.sh BOARD=retroidpocket-rp5 BRANCH=edge BUILD_DESKTOP=yes BUILD_MINIMAL=no DESKTOP_APPGROUPS_SELECTED= DESKTOP_ENVIRONMENT=gnome DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base KERNEL_CONFIGURE=no RELEASE=noble
  • ./compile.sh BOARD=retroidpocket-rp5 BRANCH=current BUILD_DESKTOP=yes BUILD_MINIMAL=no DESKTOP_APPGROUPS_SELECTED= DESKTOP_ENVIRONMENT=gnome DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base KERNEL_CONFIGURE=no RELEASE=noble

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

  • Chores

    • Expanded kernel targeting for Retroid Pocket RP5 and RPmini to include the edge track alongside current.
  • Configuration

    • Removed recently added low-level device-tree-based hardware definitions for Retroid Pocket RP5/RPmini, reverting associated display, touchscreen, LED, audio, and power subsystem configuration.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 25, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 6cf5c425-0cd1-43fe-b1d1-a8acac1db513

📥 Commits

Reviewing files that changed from the base of the PR and between d9670b0 and 916d9d9.

📒 Files selected for processing (2)
  • config/boards/retroidpocket-rp5.csc
  • config/boards/retroidpocket-rpmini.csc
✅ Files skipped from review due to trivial changes (1)
  • config/boards/retroidpocket-rp5.csc
🚧 Files skipped from review as they are similar to previous changes (1)
  • config/boards/retroidpocket-rpmini.csc

📝 Walkthrough

Walkthrough

Board configs for two Retroid Pocket models now expand KERNEL_TARGET to include "edge". A large monolithic SM8250 Retroid Pocket kernel patch was removed and replaced by three device-tree sources: a common DTSI and two board-specific DTS files for RP5 and RPmini.

Changes

Cohort / File(s) Summary
Board Kernel Configuration
config/boards/retroidpocket-rp5.csc, config/boards/retroidpocket-rpmini.csc
Updated declare -g KERNEL_TARGET from "current" to "current,edge" for both boards, expanding kernel track selection.
Removed Monolithic Patch
patch/kernel/archive/sm8250-6.18/0070-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch
Deleted large monolithic patch (≈1666 lines) that previously contained all Retroid Pocket device-tree content for SM8250.
New Device Tree Sources
patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi, patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-rp5.dts, patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-rpmini.dts
Added a common DTSI (regulators, thermal zones, audio, USB-C, LED controllers, pinctrl, subsystem enables) and two board DTS files defining simple-framebuffer, LED groups, touchscreen properties, and DSI panel nodes for RP5 and RPmini.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Possibly related issues

Poem

🐰 I nibbled code and split the log,
Small DTSI, two boards in a bog,
Kernels now carry "edge" and "current" bright,
LEDs blink left and right—what a sight! ✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main changes: updating KERNEL_TARGET to include both 'current' and 'edge' for Retroid Pocket boards, and reorganizing device tree files from patch-based to out-of-tree DTS files.
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.

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

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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 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 Apr 25, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi (2)

612-612: Nit: stray whitespace on a few lines.

Cosmetic only — no impact on the compiled DT, but worth tidying:

  • Line 612: leading space before color = <LED_COLOR_ID_RED>; ( \t\t\tcolor).
  • Line 753: space mixed into tab indent before enable-gpios = ….
  • Line 1124: trailing tab after "IN2_HPHR", "HPHR_OUT",.

Also applies to: 753-753, 1124-1124

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi` at line
612, Remove the stray whitespace found in the device tree fragment: delete the
leading space before the color assignment in the node containing color =
<LED_COLOR_ID_RED>; (ensure the line begins with the same tabs as surrounding
properties), remove the extra space mixed into the tab indent on the line with
enable-gpios = … so its indentation is consistent with other properties, and
remove the trailing tab after the string list containing "IN2_HPHR", "HPHR_OUT",
so there are no trailing whitespace characters; target the exact properties
color = <LED_COLOR_ID_RED>, enable-gpios, and the string list "IN2_HPHR",
"HPHR_OUT" when making these whitespace-only edits.

1044-1054: Minor: mixed tab/space indentation in fan_pwm_active.

Lines 1048-1052 indent the properties with spaces while the surrounding nodes (and the rest of this DTSI) use tabs. Harmless to the DTC but inconsistent with project style.

🎨 Normalize to tabs
 	fan_pwm_active: fan-pwm-active-state {
 		pins = "gpio6";
 		function = "func1";
-        bias-disable;
-        power-source = <0>;
-        output-low;
-        qcom,drive-strength = <3>;
-        drive-push-pull;
+		bias-disable;
+		power-source = <0>;
+		output-low;
+		qcom,drive-strength = <3>;
+		drive-push-pull;
 	};
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi` around
lines 1044 - 1054, The properties inside the fan_pwm_active node under
&pm8150l_gpios use spaces for indentation while the rest of the DTSI uses tabs;
update the indentation of the fan_pwm_active node (fan-pwm-active-state)
properties—pins, function, bias-disable, power-source, output-low,
qcom,drive-strength, drive-push-pull—to use tabs to match the surrounding file
style and maintain consistency with the &pm8150l_gpios node formatting.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@config/boards/retroidpocket-rp5.csc`:
- Line 7: KERNEL_TARGET is set as a space-separated string ("current edge")
which breaks the documented comma-separated parsing used by config-prepare.sh
(it expects IFS=',' to split into KERNEL_TARGET_ARRAY); update the KERNEL_TARGET
value to a comma-separated list (e.g., "current,edge") in this board config so
downstream code that reads KERNEL_TARGET_ARRAY and performs branch validation in
lib/functions/main/config-prepare.sh and config-interactive.sh works correctly
and matches the other board files.

---

Nitpick comments:
In `@patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi`:
- Line 612: Remove the stray whitespace found in the device tree fragment:
delete the leading space before the color assignment in the node containing
color = <LED_COLOR_ID_RED>; (ensure the line begins with the same tabs as
surrounding properties), remove the extra space mixed into the tab indent on the
line with enable-gpios = … so its indentation is consistent with other
properties, and remove the trailing tab after the string list containing
"IN2_HPHR", "HPHR_OUT", so there are no trailing whitespace characters; target
the exact properties color = <LED_COLOR_ID_RED>, enable-gpios, and the string
list "IN2_HPHR", "HPHR_OUT" when making these whitespace-only edits.
- Around line 1044-1054: The properties inside the fan_pwm_active node under
&pm8150l_gpios use spaces for indentation while the rest of the DTSI uses tabs;
update the indentation of the fan_pwm_active node (fan-pwm-active-state)
properties—pins, function, bias-disable, power-source, output-low,
qcom,drive-strength, drive-push-pull—to use tabs to match the surrounding file
style and maintain consistency with the &pm8150l_gpios node formatting.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: eec1c86e-6a8b-4647-9349-8b073139c06f

📥 Commits

Reviewing files that changed from the base of the PR and between 39fdcef and d9670b0.

📒 Files selected for processing (6)
  • config/boards/retroidpocket-rp5.csc
  • config/boards/retroidpocket-rpmini.csc
  • patch/kernel/archive/sm8250-6.18/0070-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch
  • patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-common.dtsi
  • patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-rp5.dts
  • patch/kernel/archive/sm8250-6.18/dt/sm8250-retroidpocket-rpmini.dts
💤 Files with no reviewable changes (1)
  • patch/kernel/archive/sm8250-6.18/0070-arm64-dts-qcom-add-SM8250-Retroid-Pocket-variant-Sig.patch

Comment thread config/boards/retroidpocket-rp5.csc Outdated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

05 Milestone: Second quarter release 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.

1 participant