about summary refs log tree commit diff
path: root/modules/hardware/t100ha/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-12-15 23:32:41 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-12-15 23:45:04 +0100
commitd912892ccb1f7ea911db54c06c99c104d1e9278b (patch)
tree77c5a3712e4d80624785b17c216d63490a74d071 /modules/hardware/t100ha/default.nix
parent4a27d62243942c4be181c7129fb532a709a15a8e (diff)
hardware/t100ha: Add patch for SST sound
This is essentially a backport of @plbossart's "experimental/codecs"
branch against Linux 4.9.

The original repository can be found at:

https://github.com/plbossart/sound/commits/experimental/codecs

Thanks to him for doing a lot of work on getting sound working for these
CherryTrail devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/hardware/t100ha/default.nix')
-rw-r--r--modules/hardware/t100ha/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix
index 00a5855d..69fd10d1 100644
--- a/modules/hardware/t100ha/default.nix
+++ b/modules/hardware/t100ha/default.nix
@@ -8,12 +8,14 @@ in {
   options.vuizvui.hardware.t100ha.enable = lib.mkEnableOption desc;
 
   config = lib.mkIf cfg.enable {
-    hardware.firmware = lib.singleton (pkgs.runCommand "brcm43340-firmware" {
+    hardware.firmware = lib.singleton (pkgs.runCommand "t100ha-firmware" {
       params = ./brcmfmac43340-sdio.txt;
-      fwbase = "lib/firmware/brcm/brcmfmac43340-sdio";
+      fwpkg = pkgs.firmwareLinuxNonfree;
       install = "install -vD -m 0644";
     } ''
-      $install "${pkgs.firmwareLinuxNonfree}/$fwbase.bin" "$out/$fwbase.bin"
+      for fw in brcm/brcmfmac43340-sdio intel/fw_sst_22a8; do
+        $install "$fwpkg/lib/firmware/$fw.bin" "$out/lib/firmware/$fw.bin"
+      done
       $install "$params" "$out/$fwbase.txt"
     '');
 
@@ -27,6 +29,9 @@ in {
       { name = "sdio";
         patch = ./sdio.patch;
       }
+      { name = "sound";
+        patch = ./sound.patch;
+      }
     ];
 
     boot.kernelPackages = let