nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fydetab/duo: fix hardware.firmware being applied

Browse source
This commit is contained in:
Tristan Ross 2025-09-05 11:16:21 -07:00
parent af3dd1cb20
commit a6cc50d994
No known key found for this signature in database
GPG key ID: B09C422035669AF8
1 changed files with 58 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

104
fydetab/duo/default.nix
View file

@ -43,56 +43,68 @@ in
}) })
]; ];
hardware = { hardware = lib.mkMerge [
deviceTree = lib.mkMerge [ {
{ deviceTree = lib.mkMerge [
name = "rockchip/rk3588s-fydetab-duo.dtb"; {
} name = "rockchip/rk3588s-fydetab-duo.dtb";
(lib.mkIf config.hardware.fydetab.duo.enablePanthor { }
overlays = [ (lib.mkIf config.hardware.fydetab.duo.enablePanthor {
{ overlays = [
name = "fydetab-panthor-gpu"; {
dtsText = '' name = "fydetab-panthor-gpu";
/dts-v1/; dtsText = ''
/plugin/; /dts-v1/;
/plugin/;
#include <dt-bindings/clock/rk3588-cru.h> #include <dt-bindings/clock/rk3588-cru.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/rk3588-power.h> #include <dt-bindings/power/rk3588-power.h>
/ { / {
compatible = "rockchip,rk3588s-tablet-12c-linux"; compatible = "rockchip,rk3588s-tablet-12c-linux";
fragment@0 { fragment@0 {
target = <&gpu>; target = <&gpu>;
__overlay__ { __overlay__ {
status = "disabled"; status = "disabled";
};
};
fragment@1 {
target = <&gpu_panthor>;
__overlay__ {
status = "okay";
mali-supply = <&vdd_gpu_s0>;
};
}; };
}; };
'';
fragment@1 { }
target = <&gpu_panthor>; ];
__overlay__ { })
status = "okay"; ];
mali-supply = <&vdd_gpu_s0>; rockchip = {
}; rk3588.enable = true;
}; platformFirmware = pkgs.callPackage ./u-boot.nix { };
}; };
''; }
} (lib.mkIf config.networking.wireless.iwd.enable {
]; firmware = [
}) # Only iwd is supported by the interface
]; ap6275pFirmware
rockchip = { ];
rk3588.enable = true; })
platformFirmware = pkgs.callPackage ./u-boot.nix { }; (lib.mkIf config.hardware.graphics.enable {
}; firmware = [
firmware = lib.mkMerge [ (pkgs.callPackage ./mali-g610.nix { })
# Only iwd is supported by the interface ];
(lib.mkIf config.networking.wireless.iwd.enable ap6275pFirmware) })
(lib.mkIf config.hardware.graphics.enable (pkgs.callPackage ./mali-g610.nix { })) (lib.mkIf config.hardware.sensor.iio.enable {
(lib.mkIf config.hardware.sensor.iio.enable (pkgs.callPackage ./himax.nix { })) firmware = [
]; (pkgs.callPackage ./himax.nix { })
}; ];
})
];
systemd.services.bluetooth-fydetab = lib.mkIf config.hardware.bluetooth.enable { systemd.services.bluetooth-fydetab = lib.mkIf config.hardware.bluetooth.enable {
description = "FydeTab Duo Bluetooth fix"; description = "FydeTab Duo Bluetooth fix";