meson64: bump edge to 6.17#8717
Conversation
WalkthroughBumps the meson64 edge branch kernel version constant from 6.16 to 6.17 in config/sources/families/include/meson64_common.inc. Separately, updates config/kernel/linux-meson64-edge.config with multiple kernel config changes: additions and removals of NETFILTER/NAT options, modifications to wireless (RTL/RTW) driver selections, RTC driver adjustments, and assorted filesystem/audio/hardware config toggles. No exported APIs or public interfaces are added or removed. Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20–30 minutes Possibly related PRs
Suggested reviewers
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
📜 Recent review detailsConfiguration used: CodeRabbit UI Review profile: CHILL Plan: Pro Disabled knowledge base sources:
⛔ Files ignored due to path filters (125)
📒 Files selected for processing (2)
🧰 Additional context used🧠 Learnings (2)📚 Learning: 2025-08-02T14:59:28.145ZApplied to files:
📚 Learning: 2025-07-27T15:54:35.119ZApplied to files:
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
🔇 Additional comments (5)
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 |
|
The kernel upstream fixed the missing PWM pinctrl C code for g12b and sm1, but did not add these PWM pinctrl nodes in the device tree. Therefore, only need to delete the Notably, pwm_b_z_pins was renamed to pwm_b_z0_pins, but this is not used in the build repository. |
|
I can't build kernel: https://paste.armbian.com/omihakikem |
will check later. set it as disable at this time |
|
Thanks for all the submissions and info, I'll integrate everything ASAP and send updates. |
677a814 to
b6071b4
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Disabled knowledge base sources:
- Jira integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
⛔ Files ignored due to path filters (124)
patch/kernel/archive/meson64-6.16/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/0000.patching_config.yamlis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-bananapi-cm4-cm4io.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-bananapi-m2s.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-bananapim5-002-add-wifi-bt-support.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-bananapism1-add-uart_A-and-AO_B.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-khadas-vim3-add-npu-node.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-khadas-vim3-fix-missing-i2c3-nod.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-khadas-vims-add-rtc-vrtc-aliases.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-nanopi-k2-add-uartC-alias.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-nanopi-k2-enable-emmc.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroid-sm1-reset.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidc2-add-uartA-uartC.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidc2-enable-SPI.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidc2-enable-scpi-dvfs.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidhc4-enable-fan1_input.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-odroidn2plus-Add-missing-CPU-opp.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/board-t95z-add-rc-remote-keymap.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/driver-power-meson64-reset.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/drv-spi-spidev-remove-warnings.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-axg-amper-gateway-am-gz80x.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-axg-amper-gateway-gz80x.dtsiis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12-enable-spinor.dtsiis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12a-radxa-zero-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-a311d-cainiao-cniot-core.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-a311d-khadas-vim3-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-a311d-khadas-vim3-spinor.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-odroid-n2-plus-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-odroid-n2-plus-spinor.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-odroid-n2-spinor.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-radxa-zero2-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-g12b-waveshare-cm4-io-base-b.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-gxm-c400-plus.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-gxm-mini-m8s-pro.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-gxm-t95z-plus.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-jethome-jethub-j200-spinor.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-jethome-jethub-j200.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-khadas-vim3l-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-khadas-vim3l-spinor.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-odroid-c4-spidev.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/dt/meson-sm1-ugoos-x3.dtsis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-add-Amlogic-Meson-GX-PM-Suspend.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-add-overlay-compilation-support.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-drm-panfrost-fix-reference-leak.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-fix-Kodi-sysinfo-CPU-information.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-gpu-drm-add-new-display-resolution-2560x1440.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-input-touchscreen-Add-D-WAV-Multitouch.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-media-cec-silence-CEC-timeout-message-HACK.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-memory-marked-nomap.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-aiu-Fix-HDMI-codec-control-selection.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-vdec-add-HEVC-decode-codec.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-vdec-add-handling-to-HEVC-decoder-.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-vdec-check-if-parser-has-really-parser.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson-vdec-improve-mmu-and-fbc-handling-.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-meson64-overlays.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-si2168-fix-cmd-timeout.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-sound-soc-remove-mono-channel-as-it-curren.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-spi-nor-add-support-for-XT25F128B.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/general-usb-core-improve-handling-of-hubs-with-no-ports.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/hwmon-emc2305-fixups-for-driver.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/jethome-0003-arm64-dts-meson-add-dts-links-to-secure-monitor-for-jethub.patch.disabledis excluded by!patch/**patch/kernel/archive/meson64-6.17/kernel-6.8-tools-cgroup-makefile.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-g12a-pinctrl-add-missing-ir-options.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-g12a-radxa-zero-gpio-pin-names.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-gxbb-dts-i2cX-missing-pins.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-gxbb-vdec-add-HEVC-support-to-GXBB.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-gxm-vdec-add-VP9-support-to-GXM.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/meson-sm1-dts-add-higher-clocks.patchis excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/Makefileis excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/README.meson-overlaysis excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-fixup.scr-cmdis excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12-gxl-cma-pool-896MB.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12-pwm-gpiox-5-fan.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-gpio-10-led.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-gpio-8-led.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-i2c-ao-m0-gpioao-2-gpioao-3.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-i2c-ee-m1-gpioh-6-gpioh-7.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-i2c-ee-m1-gpiox-10-gpiox-11.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-i2c-ee-m3-gpioa-14-gpioa-15.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-pwm-c-on-gpiox-8.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-pwmao-a-on-gpioao-11.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-spi-spidev.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-uart-ao-a-on-gpioao-0-gpioao-1.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-uart-ao-b-on-gpioao-2-gpioao-3.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-uart-ao-b-on-gpioao-8-gpioao-9.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12a-radxa-zero-uart-ee-c.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12b-bananapi-cm4-i2c2.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12b-bananapi-cm4-pwm-gpioh-5-fan.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12b-bananapi-m2s-rtl8822cs.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12b-odroid-n2-spi.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-g12b-waveshare-cm4-io-base-usb.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-i2cA.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-i2cB.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-bananapi-m5-rtl8822cs.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-bananapi-uartA.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-bananapi-uartAO_B.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-bananapi-uartA_cts_rts.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-jethome-jethub-j200-spi.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-odroid-c4-i2c0.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-sm1-odroid-c4-i2c1.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-uartA.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-uartC.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-w1-gpio.dtsois excluded by!patch/**patch/kernel/archive/meson64-6.17/overlay/meson-w1AB-gpio.dtsois excluded by!patch/**
📒 Files selected for processing (1)
config/sources/families/include/meson64_common.inc(1 hunks)
|
My ODroid-N2 boots with this kernel. |
The kernel 6.17 mainline source code already supports 8821CU; enabling the This PR closed the compilation of the out-of-tree 8821CU module for the 6.17 kernel, which is likely why your WiFi adapter isn't working. |
I have enabled mainline where missing - in the same PR: |
I just confirmed that the RTW88_8821CU in the mainline kernel is indeed disabled.
|
This commit didn't really land anywhere I think. |
|
Oh I see, it's landed but only for UEFI kernels. Let me try and enable for meson64 so we can land this. |
…to pyavitz Co-authored-by: Patrick Yavitz <pyavitz@gmail.com>
…m-https-lkml.org-l.patch`
> The kernel upstream fixed the missing PWM pinctrl C code for g12b and > sm1, but did not add these PWM pinctrl nodes in the device tree. > Therefore, only need to delete the > meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch from the repository > and add a meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch. > This patch does not include all PWM pinctrl nodes, only adding some > g12b PWM pinctrl nodes as in the old patch. Notably, pwm_b_z_pins was > renamed to pwm_b_z0_pins, but this is not used in the build repository. - thus: - added `meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch` - dropped `meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch` - kept `dt/meson-g12b-a311d-cainiao-cniot-core.dts` Co-authored-by: retro98boy <retro98boy@qq.com>
- there's gotta be something funky here - why stuff changing around?
790553a to
c5fc082
Compare
|
@iav if you could please rebuild and check if RTW88_8821CU works? |
|
I realized now I included a rogue |
|
Tadaaaam! Build, works, with 8821CU usb dongle. |
|
✅ This PR has been reviewed and approved — all set for merge! |



meson64: bump edge to 6.17
Co-authored-by: Patrick Yavitz pyavitz@gmail.com
jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patchmeson-g12b-dt-Add-missing-pinmux-node-for-pwm.patchmeson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patchdt/meson-g12b-a311d-cainiao-cniot-core.dtsCo-authored-by: retro98boy retro98boy@qq.com
Pending:
meson-g12b-pinctrl-Add-missing-pinmux-for-pwmanddt/meson-g12b-a311d-cainiao-cniot-core.dts- fixed, thanks!