From 1e1588898bcfe819111477f4b9c339178cd5f95d Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 6 Feb 2021 12:34:48 -0500
Subject: [PATCH 1/2] lib/systems/platforms: note that RPi 3 fixes aren't
 needed for kernel >=4.17

---
 lib/systems/platforms.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 3bf90cd0caf..12d4f7f9d78 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -303,7 +303,8 @@ rec {
       preferBuiltin = true;
       target = "zImage";
       extraConfig = ''
-        # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+        # Serial port for Raspberry Pi 3. Wasn't included in ARMv7 defconfig
+        # until 4.17.
         SERIAL_8250_BCM2835AUX y
         SERIAL_8250_EXTENDED y
         SERIAL_8250_SHARE_IRQ y

From 7b573e80516d77cb7ece1dcc969e5f35f6e79e74 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 6 Feb 2021 12:36:28 -0500
Subject: [PATCH 2/2] lib/systems/platforms: remove TI_CPTS override

Forcing the module to be builtin breaks 5.10, which wants to compile it as a
module (probably due to dependencies). There doesn't seem to be a need to have
it builtin anymore, so we can just remove the override.
---
 lib/systems/platforms.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 12d4f7f9d78..f46e9c826a5 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -309,9 +309,6 @@ rec {
         SERIAL_8250_EXTENDED y
         SERIAL_8250_SHARE_IRQ y
 
-        # Fix broken sunxi-sid nvmem driver.
-        TI_CPTS y
-
         # Hangs ODROID-XU4
         ARM_BIG_LITTLE_CPUIDLE n