diff --git a/pkgs/additional/linux-armbian/default.nix b/pkgs/additional/linux-armbian/default.nix index dde8280d5..51b866667 100644 --- a/pkgs/additional/linux-armbian/default.nix +++ b/pkgs/additional/linux-armbian/default.nix @@ -9,8 +9,8 @@ sane-kernel-tools, usePmosConfig ? true, withNixpkgsConfig ? true, - withFullConfig ? false, - withModemPower ? true, + withFullConfig ? true, + withModemPower ? false, #< TODO: fix so it applies withMegousPatches ? true, #VVV nixpkgs calls `.override` on the kernel to configure additional things, but we don't care about those things ... @@ -92,14 +92,14 @@ linux_latest.override { # byName."hm5065-yaml-bindings-wip" # i believe these gc2145 patches are required for either camera to register (?) (2024-09-15) byName."media-hm5065-Add-subdev-driver-for-Himax-HM5065-camera-sensor" #< required for later patch to apply: media-gc2145-Galaxycore-camera-module-driver - byName."media-i2c-gc2145-Move-upstream-driver-out-of-the-way" - byName."media-gc2145-Galaxycore-camera-module-driver" - byName."media-gc2145-Added-BGGR-bayer-mode" - byName."media-gc2145-Disable-debug-output" - byName."media-gc2145-Add-PIXEL_RATE-HBLANK-and-VBLANK-controls" - byName."media-gc2145-implement-system-suspend" - byName."media-gc2145-fix-white-balance-colors" - byName."media-i2c-gc2145-Parse-and-register-properties" + # byName."media-i2c-gc2145-Move-upstream-driver-out-of-the-way" #< linux 6.11.0: doesn't apply + # byName."media-gc2145-Galaxycore-camera-module-driver" + # byName."media-gc2145-Added-BGGR-bayer-mode" + # byName."media-gc2145-Disable-debug-output" + # byName."media-gc2145-Add-PIXEL_RATE-HBLANK-and-VBLANK-controls" + # byName."media-gc2145-implement-system-suspend" + # byName."media-gc2145-fix-white-balance-colors" + # byName."media-i2c-gc2145-Parse-and-register-properties" # byName."mailbox-Allow-to-run-mailbox-while-timekeeping-is-suspended" # byName."ARM-sunxi-Add-experimental-suspend-to-memory-implementation-for" # byName."ARM-sunxi-sunxi_cpu0_hotplug_support_set-is-not-supported-on-A8" @@ -180,7 +180,7 @@ linux_latest.override { byName."sound-soc-ac100-codec-Support-analog-part-of-X-Powers-AC100-cod" byName."sound-soc-sun8i-codec-Add-support-for-digital-part-of-the-AC100" byName."ASoC-ec25-New-codec-driver-for-the-EC25-modem" - byName."ASOC-sun9i-hdmi-audio-Initial-implementation" + # byName."ASOC-sun9i-hdmi-audio-Initial-implementation" #< linux 6.11: `error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)'` # byName."ARM-dts-sunxi-h3-h5-Add-hdmi-sound-card" # byName."ARM-dts-sun8i-h3-Enable-hdmi-sound-card-on-boards-with-hdmi" # byName."ARM-dts-sun8i-h2-plus-bananapi-m2-zero-Enable-HDMI-audio" @@ -212,7 +212,7 @@ linux_latest.override { # byName."arm64-dts-allwinner-h6-Add-SCPI-protocol" # byName."ARM-dts-sun8i-a83t-tbs-a711-Give-Linux-more-privileges-over-SCP" # byName."rtc-sun6i-Allow-RTC-wakeup-after-shutdown" - byName."misc-modem-power-Power-manager-for-modems" + (if withModemPower then byName."misc-modem-power-Power-manager-for-modems" else { patch = null; }) # byName."ARM-dts-sun8i-a83t-Add-missing-GPU-trip-point" # byName."arm64-dts-sun50i-h5-Add-missing-GPU-trip-point" byName."arm64-dts-sun50i-a64-Add-missing-trip-points-for-GPU" @@ -241,16 +241,16 @@ linux_latest.override { # byName."drm-rockchip-dw-mipi-dsi-rockchip-Fix-ISP1-PHY-initialization" # byName."drm-rockchip-dw-mipi-dsi-rockchip-Restore-DPHY-config-on-resume" # byName."bluetooth-h5-Don-t-re-initialize-rtl8723cs-on-resume" - byName."drm-sun4i-Unify-sun8i_-_layer-structs" - byName."drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback" - byName."drm-sun4i-Fix-layer-zpos-change-atomic-modesetting" - byName."drm-sun4i-drm-Change-update_bits-to-write" - byName."drm-sun4i-Mark-one-of-the-UI-planes-as-a-cursor-one" - byName."drm-sun4i-Implement-gamma-correction" + # byName."drm-sun4i-Unify-sun8i_-_layer-structs" + # byName."drm-sun4i-Add-more-parameters-to-sunxi_engine-commit-callback" + # byName."drm-sun4i-Fix-layer-zpos-change-atomic-modesetting" + # byName."drm-sun4i-drm-Change-update_bits-to-write" + # byName."drm-sun4i-Mark-one-of-the-UI-planes-as-a-cursor-one" + # byName."drm-sun4i-Implement-gamma-correction" # byName."drm-panel-st7703-Fix-xbd599-timings-to-make-refresh-rate-exactl" - byName."drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo" - byName."video-pwm_bl-Allow-to-change-lth_brightness-via-sysfs" - byName."clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x" + # byName."drm-sun4i-Support-taking-over-display-pipeline-state-from-p-boo" + # byName."video-pwm_bl-Allow-to-change-lth_brightness-via-sysfs" + # byName."clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x" byName."drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch" byName."phy-allwinner-sun4i-usb-Add-support-for-usb_role_switch" byName."regulator-axp20x-Add-support-for-vin-supply-for-drivevbus" @@ -297,9 +297,9 @@ linux_latest.override { byName."usb-typec-fusb302-Add-OF-extcon-support" byName."usb-typec-fusb302-Fix-register-definitions" byName."usb-typec-fusb302-Clear-interrupts-before-we-start-toggling" - byName."usb-typec-typec-extcon-Add-typec-extcon-bridge-driver" - byName."usb-typec-typec-extcon-Enable-debugging-for-now" - byName."usb-typec-typec-extcon-Allow-to-force-reset-on-each-mux-change" + # byName."usb-typec-typec-extcon-Add-typec-extcon-bridge-driver" #< one of these causes a build error in linux 6.11 + # byName."usb-typec-typec-extcon-Enable-debugging-for-now" + # byName."usb-typec-typec-extcon-Allow-to-force-reset-on-each-mux-change" byName."Revert-usb-typec-tcpm-unregister-existing-source-caps-before-re" byName."usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPTACLE-bit" byName."usb-typec-tcpm-Unregister-altmodes-before-registering-new-ones"