diff --git a/pkgs/additional/linux-armbian/default.nix b/pkgs/additional/linux-armbian/default.nix index 23889b355..940eee3c3 100644 --- a/pkgs/additional/linux-armbian/default.nix +++ b/pkgs/additional/linux-armbian/default.nix @@ -759,11 +759,15 @@ linux.override { # MDIO_SUN4I = yes; # PCS_XPCS = yes; - TOUCHSCREEN_GOODIX = yes; + # IP5XXX_POWER = yes; #< TODO: almost certainly not used in Pinephone + # TOUCHSCREEN_GOODIX = yes; + + # some or all of these are required for display initialization. + # removing these, and adding their modules to initrd, still results in no display. INPUT_AXP20X_PEK = yes; - IP5XXX_POWER = yes; #< TODO: almost certainly not used in Pinephone CHARGER_AXP20X = yes; BATTERY_AXP20X = yes; + AXP20X_ADC = yes; AXP20X_POWER = yes; REGULATOR_VCTRL = yes; @@ -772,20 +776,22 @@ linux.override { # CEC_CORE = yes; # DVB_CORE = yes; - MEDIA_SUPPORT = yes; #< removing this forces V4L2 stuff to be degraded to module - VIDEO_DEV = yes; - V4L2_MEM2MEM_DEV = yes; - # # V4L2_FLASH_LED_CLASS = yes; - V4L2_FWNODE = yes; - V4L2_ASYNC = yes; - VIDEO_MEM2MEM_DEINTERLACE = yes; - VIDEO_SUN6I_CSI = yes; - VIDEO_SUN8I_DEINTERLACE = yes; - VIDEO_SUN8I_ROTATE = yes; - VIDEOBUF2_CORE = yes; - VIDEOBUF2_V4L2 = yes; - VIDEOBUF2_MEMOPS = yes; - VIDEOBUF2_DMA_CONTIG = yes; + # MEDIA_SUPPORT = yes; #< removing this forces V4L2 stuff to be degraded to module + # VIDEO_DEV = yes; + # V4L2_MEM2MEM_DEV = yes; + # # # V4L2_FLASH_LED_CLASS = yes; + # V4L2_FWNODE = yes; + # V4L2_ASYNC = yes; + # VIDEO_MEM2MEM_DEINTERLACE = yes; + # VIDEO_SUN6I_CSI = yes; + # VIDEO_SUN8I_DEINTERLACE = yes; + # VIDEO_SUN8I_ROTATE = yes; + # VIDEOBUF2_CORE = yes; + # VIDEOBUF2_V4L2 = yes; + # VIDEOBUF2_MEMOPS = yes; + # VIDEOBUF2_DMA_CONTIG = yes; + # VIDEO_SUNXI_CEDRUS = yes; + DRM_DISPLAY_HELPER = yes; DRM_GEM_DMA_HELPER = yes; DRM_GEM_SHMEM_HELPER = yes; @@ -798,12 +804,12 @@ linux.override { DRM_DW_HDMI = yes; DRM_LIMA = yes; DRM_PANFROST = yes; + LCD_CLASS_DEVICE = yes; BACKLIGHT_CLASS_DEVICE = yes; BACKLIGHT_PWM = yes; + DMA_SUN6I = yes; - VIDEO_SUNXI_CEDRUS = yes; - AXP20X_ADC = yes; # USB stuff ellided... PWM_SUN4I = yes; PHY_SUN6I_MIPI_DPHY = yes;