From 81b54889611078a818fd468f004fd101ec96d518 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 25 Oct 2020 22:29:07 +0100
Subject: [PATCH 1/2] t14s: add comment

Add commend about suspending to RAM and fingerprint sensor.
---
 lenovo/thinkpad/t14s/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lenovo/thinkpad/t14s/default.nix b/lenovo/thinkpad/t14s/default.nix
index 64957e6..71761ed 100644
--- a/lenovo/thinkpad/t14s/default.nix
+++ b/lenovo/thinkpad/t14s/default.nix
@@ -7,6 +7,11 @@
     ../../../common/pc/laptop/acpi_call.nix
   ];
 
+  # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.
+  # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues
+
+  # Fingerprint sensor requires a firmware-update to work.
+
   # Force use of the thinkpad_acpi driver for backlight control.
   # This allows the backlight save/load systemd service to work.
   boot.kernelParams = [ "acpi_backlight=native" ];

From 04c79afe1c44ed49523dd26809571e6e32ed6802 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 25 Oct 2020 23:16:27 +0100
Subject: [PATCH 2/2] t14s: add AMD Gen1 model

t14s: fix minimum required kernel version
---
 README.md                                 |  1 +
 flake.nix                                 |  1 +
 lenovo/thinkpad/t14s/amd/default.nix      | 11 +++++++++++
 lenovo/thinkpad/t14s/amd/gen1/default.nix |  8 ++++++++
 lenovo/thinkpad/t14s/default.nix          |  1 -
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 lenovo/thinkpad/t14s/amd/default.nix
 create mode 100644 lenovo/thinkpad/t14s/amd/gen1/default.nix

diff --git a/README.md b/README.md
index 8f36405..bb28005 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ See code for all available configurations.
 | Lenovo ThinkPad L14 (AMD)         | `<nixos-hardware/lenovo/thinkpad/l14/amd>          |
 | Lenovo ThinkPad P53               | `<nixos-hardware/lenovo/thinkpad/p53>`             |
 | Lenovo ThinkPad T14s              | `<nixos-hardware/lenovo/thinkpad/t14s>`            |
+| Lenovo ThinkPad T14s AMD Gen 1    | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>`   |
 | Lenovo ThinkPad T410              | `<nixos-hardware/lenovo/thinkpad/t410>`            |
 | Lenovo ThinkPad T420              | `<nixos-hardware/lenovo/thinkpad/t420>`            |
 | Lenovo ThinkPad T430              | `<nixos-hardware/lenovo/thinkpad/t430>`            |
diff --git a/flake.nix b/flake.nix
index da24084..592f342 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
       lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd;
       lenovo-thinkpad-p53 = import ./lenovo/thinkpad/p53;
       lenovo-thinkpad-t14s = import ./lenovo/thinkpad/t14s;
+      lenovo-thinkpad-t14s-amd-gen1 = import ./lenovo/thinkpad/t14s/amd/gen1;
       lenovo-thinkpad-t410 = import ./lenovo/thinkpad/t410;
       lenovo-thinkpad-t420 = import ./lenovo/thinkpad/t420;
       lenovo-thinkpad-t430 = import ./lenovo/thinkpad/t430;
diff --git a/lenovo/thinkpad/t14s/amd/default.nix b/lenovo/thinkpad/t14s/amd/default.nix
new file mode 100644
index 0000000..2b860e8
--- /dev/null
+++ b/lenovo/thinkpad/t14s/amd/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../../common/cpu/amd
+  ];
+
+  # For support of newer AMD GPUs, backlight and internal microphone
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.8") pkgs.linuxPackages_latest;
+}
diff --git a/lenovo/thinkpad/t14s/amd/gen1/default.nix b/lenovo/thinkpad/t14s/amd/gen1/default.nix
new file mode 100644
index 0000000..cb1ec7d
--- /dev/null
+++ b/lenovo/thinkpad/t14s/amd/gen1/default.nix
@@ -0,0 +1,8 @@
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+  ];
+}
diff --git a/lenovo/thinkpad/t14s/default.nix b/lenovo/thinkpad/t14s/default.nix
index 71761ed..d783b21 100644
--- a/lenovo/thinkpad/t14s/default.nix
+++ b/lenovo/thinkpad/t14s/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../.
-    ../../../common/cpu/amd
     ../../../common/pc/laptop/acpi_call.nix
   ];