From 09bbd9fd91b3c4c0bb9ecdd494f86e56a0f8adf6 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 19 Sep 2024 00:09:53 +0000 Subject: [PATCH] NOT FOR MERGE: moby: switch a few more kernel options back to their default display: non-functional --- pkgs/additional/linux-armbian/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/additional/linux-armbian/default.nix b/pkgs/additional/linux-armbian/default.nix index 940eee3c3..a9deb331d 100644 --- a/pkgs/additional/linux-armbian/default.nix +++ b/pkgs/additional/linux-armbian/default.nix @@ -694,7 +694,7 @@ linux.override { # # VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI # #^^^ this isn't enough to get camera working - MFD_SUN6I_PRCM = yes; + # MFD_SUN6I_PRCM = yes; # allow kernel modules to read the device tree at runtime OF_RESOLVE = yes; @@ -730,6 +730,7 @@ linux.override { # RCU_FANOUT = freeform "64"; # RCU_FANOUT_LEAF = freeform "16"; + # some or all of this is required for `megapixels`(-next) to operate the camera (possibly CMA/DMA related?) ARM64_LPA2 = yes; ARM64_VA_BITS_48 = yes; #< 48 (not 52) bits for virtual addresses. the other bit widths are then derived same as pmos config # ARM64_VA_BITS = freeform "48"; @@ -805,14 +806,14 @@ linux.override { DRM_LIMA = yes; DRM_PANFROST = yes; - LCD_CLASS_DEVICE = yes; - BACKLIGHT_CLASS_DEVICE = yes; - BACKLIGHT_PWM = yes; + # LCD_CLASS_DEVICE = yes; + # BACKLIGHT_CLASS_DEVICE = yes; + # BACKLIGHT_PWM = yes; - DMA_SUN6I = yes; + # DMA_SUN6I = yes; # USB stuff ellided... - PWM_SUN4I = yes; - PHY_SUN6I_MIPI_DPHY = yes; + # PWM_SUN4I = yes; + # PHY_SUN6I_MIPI_DPHY = yes; # PHY_SUN50I_USB3 = yes; # PHY_QCOM_USB_HS = yes;