gnu: linux-libre-pinebook-pro: Update patches for 5.10.14.

* gnu/local.mk: Update patches.
* gnu/packages/linux.scm (%pinebook-pro-patches): Update patches.
* gnu/packages/patches/linux-libre-pinebook-pro-*.patch: Updated patches.

26 files changed, 119 insertions, 562 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 3fdcc71314..2adcbe7f72 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1316,30 +1316,28 @@ dist_patch_DATA =						\
   %D%/packages/patches/linkchecker-tests-require-network.patch	\
   %D%/packages/patches/linphoneqt-tabbutton.patch		\
   %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch \
-  %D%/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-01-soc-rockchip-Add-rockchip-suspend-mode-driver.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-02-firmware-Add-Rockchip-SIP-driver.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-03-tty-serdev-support-shutdown-op.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-04-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_bcm-disable-power-on-shutdown.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-06-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-07-regulator-core-add-generic-suspend-states-support.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-08-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-09-usb-typec-tcpm-add-hacky-generic-altmode-support.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-10-phy-rockchip-typec-Set-extcon-capabilities.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-11-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-12-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-13-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-14-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-enable-earlycon.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-add-typec-extcon-hack.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-19-arm64-dts-rockchip-add-rockchip-suspend-node.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-20-arm64-configs-add-defconfig-for-Pinebook-Pro.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch \
+  %D%/packages/patches/linux-libre-pinebook-pro-22-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch \
   %D%/packages/patches/linux-pam-no-setfsuid.patch		\
   %D%/packages/patches/lirc-localstatedir.patch			\
   %D%/packages/patches/lirc-reproducible-build.patch		\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 91f7ef7cc5..c2eb26448f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -466,32 +466,30 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 (define %pinebook-pro-patches
   ;; Pinebook Pro patches from manjaro v5.10 branch:
   ;; https://gitlab.manjaro.org/tsys/linux-pinebook-pro.git
-  ;; Rebased for 5.10.9
+  ;; Rebased and squashed for 5.10.14
   (search-patches
-   "linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch"
-   "linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch"
-   "linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch"
-   "linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch"
-   "linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch"
-   "linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch"
-   "linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch"
-   "linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch"
-   "linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch"
-   "linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch"
-   "linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch"
-   "linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch"
-   "linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch"
-   "linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch"
-   "linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch"
-   "linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch"
-   "linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch"
-   "linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch"
-   "linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch"
-   "linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch"
-   "linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch"
-   "linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch"
-   "linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch"
-   "linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch"))
+   "linux-libre-pinebook-pro-01-soc-rockchip-Add-rockchip-suspend-mode-driver.patch"
+   "linux-libre-pinebook-pro-02-firmware-Add-Rockchip-SIP-driver.patch"
+   "linux-libre-pinebook-pro-03-tty-serdev-support-shutdown-op.patch"
+   "linux-libre-pinebook-pro-04-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch"
+   "linux-libre-pinebook-pro-05-bluetooth-hci_bcm-disable-power-on-shutdown.patch"
+   "linux-libre-pinebook-pro-06-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch"
+   "linux-libre-pinebook-pro-07-regulator-core-add-generic-suspend-states-support.patch"
+   "linux-libre-pinebook-pro-08-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch"
+   "linux-libre-pinebook-pro-09-usb-typec-tcpm-add-hacky-generic-altmode-support.patch"
+   "linux-libre-pinebook-pro-10-phy-rockchip-typec-Set-extcon-capabilities.patch"
+   "linux-libre-pinebook-pro-11-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch"
+   "linux-libre-pinebook-pro-12-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch"
+   "linux-libre-pinebook-pro-13-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch"
+   "linux-libre-pinebook-pro-14-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch"
+   "linux-libre-pinebook-pro-15-arm64-dts-rockchip-enable-earlycon.patch"
+   "linux-libre-pinebook-pro-16-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch"
+   "linux-libre-pinebook-pro-17-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch"
+   "linux-libre-pinebook-pro-18-arm64-dts-rockchip-add-typec-extcon-hack.patch"
+   "linux-libre-pinebook-pro-19-arm64-dts-rockchip-add-rockchip-suspend-node.patch"
+   "linux-libre-pinebook-pro-20-arm64-configs-add-defconfig-for-Pinebook-Pro.patch"
+   "linux-libre-pinebook-pro-21-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch"
+   "linux-libre-pinebook-pro-22-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch"))
 
 (define (source-with-patches source patches)
   (origin
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch b/gnu/packages/patches/linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch
deleted file mode 100644
index 9b3239dc60..0000000000
--- a/gnu/packages/patches/linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From 0c6231f7c7d87bdd20d209703c6e0160ea32bc17 Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Thu, 28 May 2020 14:01:59 +0200
-Subject: [PATCH 01/25] leds: Add support for inverted LED triggers
-
-Needs to be changed for upstream, invert via sysfs not trigger duplication
-
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
----
- drivers/leds/led-core.c     |   1 +
- drivers/leds/led-triggers.c | 149 +++++++++++++++++++++++++++---------
- include/linux/leds.h        |   1 +
- 3 files changed, 113 insertions(+), 38 deletions(-)
-
-diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
-index c4e780bdb385..3973676d6f1e 100644
---- a/drivers/leds/led-core.c
-+++ b/drivers/leds/led-core.c
-@@ -177,6 +177,7 @@ static void led_blink_setup(struct led_classdev *led_cdev,
- 		     unsigned long *delay_off)
- {
- 	if (!test_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags) &&
-+	    !test_bit(LED_BLINK_INVERT, &led_cdev->work_flags) &&
- 	    led_cdev->blink_set &&
- 	    !led_cdev->blink_set(led_cdev, delay_on, delay_off))
- 		return;
-diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
-index 91da90cfb11d..7f2898a0e1e3 100644
---- a/drivers/leds/led-triggers.c
-+++ b/drivers/leds/led-triggers.c
-@@ -27,20 +27,89 @@ LIST_HEAD(trigger_list);
- 
-  /* Used by LED Class */
- 
-+
- static inline bool
- trigger_relevant(struct led_classdev *led_cdev, struct led_trigger *trig)
- {
- 	return !trig->trigger_type || trig->trigger_type == led_cdev->trigger_type;
- }
- 
-+
-+#define TRIGGER_INVERT_SUFFIX "-inverted"
-+
-+/*
-+ * Check suffix of trigger name agains TRIGGER_INVERT_SUFFIX
-+ */
-+static bool led_trigger_is_inverted(const char *trigname)
-+{
-+	if (strlen(trigname) >= strlen(TRIGGER_INVERT_SUFFIX)) {
-+		return !strcmp(trigname + strlen(trigname) -
-+				 strlen(TRIGGER_INVERT_SUFFIX),
-+				TRIGGER_INVERT_SUFFIX);
-+	}
-+
-+	return false;
-+}
-+
-+/*
-+ * Get length of trigger name name without TRIGGER_INVERT_SUFFIX
-+ */
-+static size_t led_trigger_get_name_len(const char *trigname)
-+{
-+	// Subtract length of TRIGGER_INVERT_SUFFIX if trigger is inverted
-+	if (led_trigger_is_inverted(trigname))
-+		return strlen(trigname) - strlen(TRIGGER_INVERT_SUFFIX);
-+	return strlen(trigname);
-+}
-+
-+/*
-+ * Find and set led trigger by name
-+ */
-+static int led_trigger_set_str_(struct led_classdev *led_cdev,
-+			       const char *trigname, bool lock)
-+{
-+	struct led_trigger *trig;
-+	bool inverted = led_trigger_is_inverted(trigname);
-+	size_t len = led_trigger_get_name_len(trigname);
-+
-+	down_read(&triggers_list_lock);
-+	list_for_each_entry(trig, &trigger_list, next_trig) {
-+		/* Compare trigger name without inversion suffix */
-+		if (strlen(trig->name) == len &&
-+		    !strncmp(trigname, trig->name, len) &&
-+		    trigger_relevant(led_cdev, trig)) {
-+			if (lock)
-+				down_write(&led_cdev->trigger_lock);
-+			led_trigger_set(led_cdev, trig);
-+			if (inverted)
-+				led_cdev->flags |= LED_INVERT_TRIGGER;
-+			else
-+				led_cdev->flags &= ~LED_INVERT_TRIGGER;
-+			if (lock)
-+				up_write(&led_cdev->trigger_lock);
-+
-+			up_read(&triggers_list_lock);
-+			return 0;
-+		}
-+	}
-+	/* we come here only if trigname matches no trigger */
-+	up_read(&triggers_list_lock);
-+	return -EINVAL;
-+}
-+
-+#define led_trigger_set_str(cdev, name) led_trigger_set_str_(cdev, name, true)
-+#define led_trigger_set_str_unlocked(cdev, name) \
-+		led_trigger_set_str_(cdev, name, false)
-+
-+
- ssize_t led_trigger_write(struct file *filp, struct kobject *kobj,
- 			  struct bin_attribute *bin_attr, char *buf,
- 			  loff_t pos, size_t count)
- {
- 	struct device *dev = kobj_to_dev(kobj);
- 	struct led_classdev *led_cdev = dev_get_drvdata(dev);
--	struct led_trigger *trig;
- 	int ret = count;
-+	char *name;
- 
- 	mutex_lock(&led_cdev->led_access);
- 
-@@ -54,20 +123,10 @@ ssize_t led_trigger_write(struct file *filp, struct kobject *kobj,
- 		goto unlock;
- 	}
- 
--	down_read(&triggers_list_lock);
--	list_for_each_entry(trig, &trigger_list, next_trig) {
--		if (sysfs_streq(buf, trig->name) && trigger_relevant(led_cdev, trig)) {
--			down_write(&led_cdev->trigger_lock);
--			led_trigger_set(led_cdev, trig);
--			up_write(&led_cdev->trigger_lock);
--
--			up_read(&triggers_list_lock);
--			goto unlock;
--		}
--	}
--	/* we come here only if buf matches no trigger */
--	ret = -EINVAL;
--	up_read(&triggers_list_lock);
-+	name = strim(buf);
-+	ret = led_trigger_set_str(led_cdev, name);
-+	if (!ret)
-+		ret = count;
- 
- unlock:
- 	mutex_unlock(&led_cdev->led_access);
-@@ -99,16 +158,25 @@ static int led_trigger_format(char *buf, size_t size,
- 				       led_cdev->trigger ? "none" : "[none]");
- 
- 	list_for_each_entry(trig, &trigger_list, next_trig) {
--		bool hit;
-+		bool hit = led_cdev->trigger == trig;
-+		bool inverted = led_cdev->flags & LED_INVERT_TRIGGER;
- 
- 		if (!trigger_relevant(led_cdev, trig))
- 			continue;
- 
--		hit = led_cdev->trigger && !strcmp(led_cdev->trigger->name, trig->name);
-+		/* print non-inverted trigger */
-+		len += led_trigger_snprintf(buf + len, size - len,
-+					    " %s%s%s",
-+					    hit && !inverted ? "[" : "",
-+					    trig->name,
-+					    hit && !inverted ? "]" : "");
- 
-+		/* print inverted trigger */
- 		len += led_trigger_snprintf(buf + len, size - len,
--					    " %s%s%s", hit ? "[" : "",
--					    trig->name, hit ? "]" : "");
-+					    " %s%s"TRIGGER_INVERT_SUFFIX"%s",
-+					    hit && inverted ? "[" : "",
-+					    trig->name,
-+					    hit && inverted ? "]" : "");
- 	}
- 
- 	len += led_trigger_snprintf(buf + len, size - len, "\n");
-@@ -245,22 +313,15 @@ EXPORT_SYMBOL_GPL(led_trigger_remove);
- 
- void led_trigger_set_default(struct led_classdev *led_cdev)
- {
--	struct led_trigger *trig;
-+	bool found;
- 
- 	if (!led_cdev->default_trigger)
- 		return;
- 
- 	down_read(&triggers_list_lock);
--	down_write(&led_cdev->trigger_lock);
--	list_for_each_entry(trig, &trigger_list, next_trig) {
--		if (!strcmp(led_cdev->default_trigger, trig->name) &&
--		    trigger_relevant(led_cdev, trig)) {
--			led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
--			led_trigger_set(led_cdev, trig);
--			break;
--		}
--	}
--	up_write(&led_cdev->trigger_lock);
-+	found = !led_trigger_set_str(led_cdev, led_cdev->default_trigger);
-+	if (found)
-+		led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
- 	up_read(&triggers_list_lock);
- }
- EXPORT_SYMBOL_GPL(led_trigger_set_default);
-@@ -305,12 +366,15 @@ int led_trigger_register(struct led_trigger *trig)
- 	/* Register with any LEDs that have this as a default trigger */
- 	down_read(&leds_list_lock);
- 	list_for_each_entry(led_cdev, &leds_list, node) {
-+		bool found;
-+
- 		down_write(&led_cdev->trigger_lock);
- 		if (!led_cdev->trigger && led_cdev->default_trigger &&
--		    !strcmp(led_cdev->default_trigger, trig->name) &&
- 		    trigger_relevant(led_cdev, trig)) {
--			led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
--			led_trigger_set(led_cdev, trig);
-+			found = !led_trigger_set_str_unlocked(led_cdev,
-+					led_cdev->default_trigger);
-+			if (found)
-+				led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
- 		}
- 		up_write(&led_cdev->trigger_lock);
- 	}
-@@ -383,8 +447,14 @@ void led_trigger_event(struct led_trigger *trig,
- 		return;
- 
- 	read_lock(&trig->leddev_list_lock);
--	list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list)
--		led_set_brightness(led_cdev, brightness);
-+	list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) {
-+		/* Reverse brightness if LED is inverted */
-+		if (led_cdev->flags & LED_INVERT_TRIGGER)
-+			led_set_brightness(led_cdev,
-+				led_cdev->max_brightness - brightness);
-+		else
-+			led_set_brightness(led_cdev, brightness);
-+	}
- 	read_unlock(&trig->leddev_list_lock);
- }
- EXPORT_SYMBOL_GPL(led_trigger_event);
-@@ -402,10 +472,13 @@ static void led_trigger_blink_setup(struct led_trigger *trig,
- 
- 	read_lock(&trig->leddev_list_lock);
- 	list_for_each_entry(led_cdev, &trig->led_cdevs, trig_list) {
--		if (oneshot)
-+		bool trigger_inverted =
-+			!!(led_cdev->flags & LED_INVERT_TRIGGER);
-+		if (oneshot) {
-+			/* use logical xnor to determine inversion parameter */
- 			led_blink_set_oneshot(led_cdev, delay_on, delay_off,
--					      invert);
--		else
-+					      (!!invert) == trigger_inverted);
-+		} else
- 			led_blink_set(led_cdev, delay_on, delay_off);
- 	}
- 	read_unlock(&trig->leddev_list_lock);
-diff --git a/include/linux/leds.h b/include/linux/leds.h
-index 6a8d6409c993..9cbf42cf08e8 100644
---- a/include/linux/leds.h
-+++ b/include/linux/leds.h
-@@ -79,6 +79,7 @@ struct led_classdev {
- #define LED_BRIGHT_HW_CHANGED	BIT(21)
- #define LED_RETAIN_AT_SHUTDOWN	BIT(22)
- #define LED_INIT_DEFAULT_TRIGGER BIT(23)
-+#define LED_INVERT_TRIGGER	BIT(24)
- 
- 	/* set_brightness_work / blink_timer flags, atomic, private. */
- 	unsigned long		work_flags;
--- 
-2.30.0
-
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch b/gnu/packages/patches/linux-libre-pinebook-pro-01-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
index 27e3865582..8ca0c39bb3 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-01-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
@@ -1,7 +1,7 @@
-From 3248fd8a16fd3815de2f66a4693eabdb8ceae6b8 Mon Sep 17 00:00:00 2001
+From bd06237d842c9a2c57905f42a7ccb5f085b9ea12 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:06:20 +0200
-Subject: [PATCH 02/25] soc: rockchip: Add rockchip suspend mode driver
+Subject: [PATCH 01/22] soc: rockchip: Add rockchip suspend mode driver
 
 Code gore, do not mainline. This belongs in ATF
 
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch b/gnu/packages/patches/linux-libre-pinebook-pro-02-firmware-Add-Rockchip-SIP-driver.patch
index f43482d582..9190e0086b 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-02-firmware-Add-Rockchip-SIP-driver.patch
@@ -1,7 +1,7 @@
-From 5e12e8a5194513d83fd45c4e765b7bc81ee3ee0a Mon Sep 17 00:00:00 2001
+From f96cdf076bcc4a12af7670c5cb3ff584d2adf988 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:11:05 +0200
-Subject: [PATCH 03/25] firmware: Add Rockchip SIP driver
+Subject: [PATCH 02/22] firmware: Add Rockchip SIP driver
 
 Used exclusively for suspend signaling. Drop for mainline and
 use PSCI
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch b/gnu/packages/patches/linux-libre-pinebook-pro-03-tty-serdev-support-shutdown-op.patch
index 72be835b1e..48591d444a 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-03-tty-serdev-support-shutdown-op.patch
@@ -1,7 +1,7 @@
-From 2bbf6948fa674a86e1c101112455e7323b84dfe7 Mon Sep 17 00:00:00 2001
+From 336bc343e754aa1b30c877eec59b3fa1e905aa1e Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:12:56 +0200
-Subject: [PATCH 04/25] tty: serdev: support shutdown op
+Subject: [PATCH 03/22] tty: serdev: support shutdown op
 
 Allow serdev drivers to register a shutdown handler
 
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch b/gnu/packages/patches/linux-libre-pinebook-pro-04-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
index 715c8ad831..0d68d4c9ae 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-04-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
@@ -1,7 +1,7 @@
-From 6f76ad0bf7508186247a2a02ad22450c0b6244bf Mon Sep 17 00:00:00 2001
+From bbb5b65d82c2fdbe80cf5fe4d7bfefee738f110c Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:14:06 +0200
-Subject: [PATCH 05/25] bluetooth: hci_serdev: Clear registered bit on
+Subject: [PATCH 04/22] bluetooth: hci_serdev: Clear registered bit on
  unregister
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch b/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_bcm-disable-power-on-shutdown.patch
index 6d915f7499..4ec2d8b6ef 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_bcm-disable-power-on-shutdown.patch
@@ -1,7 +1,7 @@
-From 0864be1539abd7d484d70b9644e1aae5493762cc Mon Sep 17 00:00:00 2001
+From 60a2b2a921205f5a42c94f7e9c491ca7d11ad820 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:15:08 +0200
-Subject: [PATCH 06/25] bluetooth: hci_bcm: disable power on shutdown
+Subject: [PATCH 05/22] bluetooth: hci_bcm: disable power on shutdown
 
 Firmware behaves wonky when not power cycled over reboots
 
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch b/gnu/packages/patches/linux-libre-pinebook-pro-06-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
index 6fe30b45db..506911440f 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-06-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
@@ -1,7 +1,7 @@
-From 5713dbccdad4c1eb4ebc17d7a45af644532a7ccc Mon Sep 17 00:00:00 2001
+From 53639b3558c206be0fec6153f307e5c28f1dd343 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:16:52 +0200
-Subject: [PATCH 07/25] mmc: core: pwrseq_simple: disable mmc power on shutdown
+Subject: [PATCH 06/22] mmc: core: pwrseq_simple: disable mmc power on shutdown
 
 Fix for Broadcom SDIO WiFi modules. They misbehave if reinitialized
 without a power cycle.
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch b/gnu/packages/patches/linux-libre-pinebook-pro-07-regulator-core-add-generic-suspend-states-support.patch
index c7c959bb20..d5ec58e897 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-07-regulator-core-add-generic-suspend-states-support.patch
@@ -1,7 +1,7 @@
-From 76c1a1db722fc5927588e6f72402a21474a9dcbe Mon Sep 17 00:00:00 2001
+From c54fa5c850858a70cfab20bf81ec8b0fb0b9e4c2 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:19:31 +0200
-Subject: [PATCH 08/25] regulator: core: add generic suspend states support
+Subject: [PATCH 07/22] regulator: core: add generic suspend states support
 
 This commit adds genric suspend support for regualtors without
 explicit suspend ops.
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch b/gnu/packages/patches/linux-libre-pinebook-pro-08-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
index 229e7a2df1..ed1f6d72fa 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-08-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
@@ -1,7 +1,7 @@
-From 56ed7bf8b832acd44124979f271039edafc3926e Mon Sep 17 00:00:00 2001
+From e4f2d18bd78d5df019f9f68b56c9d6e8fa12afb5 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:22:09 +0200
-Subject: [PATCH 09/25] usb: typec: bus: Catch crash due to partner NULL value
+Subject: [PATCH 08/22] usb: typec: bus: Catch crash due to partner NULL value
 
 Think this has been fixed upstream, have not seen it happen for ages.
 Drop on next rebase.
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch b/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
index 7623391442..0aa1410063 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
@@ -1,7 +1,7 @@
-From 4cc23f7ad56655303ca839d2956d7f5d7c5d0696 Mon Sep 17 00:00:00 2001
+From e0e623d023f4781e93cdca1c3774723fe989e520 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:23:54 +0200
-Subject: [PATCH 10/25] usb: typec: tcpm: add hacky generic altmode support
+Subject: [PATCH 09/22] usb: typec: tcpm: add hacky generic altmode support
 
 This is a hack and it is based on extcon. Do not try to mainline
 unless you are in need for some retroactive abortion by the
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch b/gnu/packages/patches/linux-libre-pinebook-pro-10-phy-rockchip-typec-Set-extcon-capabilities.patch
index a465c3abf9..12986568c0 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-10-phy-rockchip-typec-Set-extcon-capabilities.patch
@@ -1,7 +1,7 @@
-From 25cc182e2d2e266dc5aea0abde45220d590329bb Mon Sep 17 00:00:00 2001
+From bad8f5fa346a3de7e394ccc8ba96b9939c6de966 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:25:32 +0200
-Subject: [PATCH 11/25] phy: rockchip: typec: Set extcon capabilities
+Subject: [PATCH 10/22] phy: rockchip: typec: Set extcon capabilities
 
 Do not mainline, hack.
 
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch b/gnu/packages/patches/linux-libre-pinebook-pro-11-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
index 570ed9d00e..383964c34f 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-11-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
@@ -1,7 +1,7 @@
-From d2690c535f7766bce79a5dee06051c96698f90b3 Mon Sep 17 00:00:00 2001
+From c6e5e01ca875770f71febe4c87f60fd57df86f6f Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:26:27 +0200
-Subject: [PATCH 12/25] usb: typec: altmodes: displayport: Add hacky, generic
+Subject: [PATCH 11/22] usb: typec: altmodes: displayport: Add hacky, generic
  altmode detection
 
 Do not mainline, hack.
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch b/gnu/packages/patches/linux-libre-pinebook-pro-12-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
index 2f1c5cbcf3..145dcaebbe 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-12-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
@@ -1,7 +1,7 @@
-From c857311f9d88375f1e8776be6b48e41f3d5cef8d Mon Sep 17 00:00:00 2001
+From 126efe7f7d0e627bfe03d4d78832bef3490d40d1 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:34:47 +0200
-Subject: [PATCH 13/25] sound: soc: codecs: es8316: Run micdetect only if jack
+Subject: [PATCH 12/22] sound: soc: codecs: es8316: Run micdetect only if jack
  status asserted
 
 Think this is (was?) required to prevent flapping of detection status on
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch b/gnu/packages/patches/linux-libre-pinebook-pro-13-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
index 865a585fc9..4474287811 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-13-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
@@ -1,7 +1,7 @@
-From a23ca7bcab36e325895be5a65cb6f24dc092a233 Mon Sep 17 00:00:00 2001
+From f171e08de69e55167fbab2fd3e15b5ee10024e80 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:36:47 +0200
-Subject: [PATCH 14/25] ASoC: soc-jack.c: supported inverted jack detect GPIOs
+Subject: [PATCH 13/22] ASoC: soc-jack.c: supported inverted jack detect GPIOs
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
 ---
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch b/gnu/packages/patches/linux-libre-pinebook-pro-14-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
index b8238c4c9e..bc99d0df33 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-14-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
@@ -1,7 +1,7 @@
-From c6e32234b528d57bfd068e13dbdd184a420dffe2 Mon Sep 17 00:00:00 2001
+From 9d17d48ded2440f543fa2c7468a7fc976cea9458 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:38:03 +0200
-Subject: [PATCH 15/25] arm64: dts: rockchip: add default rk3399
+Subject: [PATCH 14/22] arm64: dts: rockchip: add default rk3399
  rockchip-suspend node
 
 Again this has no place in mainline. Should be handled by ATF
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch b/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-enable-earlycon.patch
index 4e12a54767..b72b8217c5 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-enable-earlycon.patch
@@ -1,7 +1,7 @@
-From 3b788af95d6d865b47e7cbbcfff8dd088417ebe8 Mon Sep 17 00:00:00 2001
+From 6a2021b2b1b12fd451fa64abdb5035e966869b14 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:39:55 +0200
-Subject: [PATCH 16/25] arm64: dts: rockchip: enable earlycon
+Subject: [PATCH 15/22] arm64: dts: rockchip: enable earlycon
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
 ---
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch b/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
index 71cad9ff9d..2e86c5d859 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
@@ -1,7 +1,7 @@
-From a3d0420f6b403f4831c7158903d74651d92c426b Mon Sep 17 00:00:00 2001
+From 7ef823687e24b71de4280fcf4c4b32fc05c3be12 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:40:31 +0200
-Subject: [PATCH 17/25] arm64: dts: rockchip: reserve memory for ATF rockchip
+Subject: [PATCH 16/22] arm64: dts: rockchip: reserve memory for ATF rockchip
  SIP
 
 Definitely not for mainline
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch b/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
index 5584e21cfb..7c69053fde 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
@@ -1,7 +1,7 @@
-From 1ee1be64645deae2dd53a01d73898f0bf755e78c Mon Sep 17 00:00:00 2001
+From 31ceda56288f7679eeffc8fc892ab2c65c1e74b9 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:42:54 +0200
-Subject: [PATCH 18/25] arm64: dts: rockchip: use power led for disk-activity
+Subject: [PATCH 17/22] arm64: dts: rockchip: use power led for disk-activity
  indication
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch b/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-add-typec-extcon-hack.patch
index 24d9a1b953..9f6f080a5b 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-add-typec-extcon-hack.patch
@@ -1,7 +1,7 @@
-From 9be0d46fe0bbcb16a413c3e5c310444c5c8223ac Mon Sep 17 00:00:00 2001
+From f39335d0fecd2a0994a5b9572064ec78d2bd746c Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:44:15 +0200
-Subject: [PATCH 20/25] arm64: dts: rockchip: add typec extcon hack
+Subject: [PATCH 18/22] arm64: dts: rockchip: add typec extcon hack
 
 Not for mainline
 
@@ -11,10 +11,10 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index decb212e2dca..37f967a89401 100644
+index 667eeeb019de..7c5bca24481c 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -401,6 +401,7 @@ opp08 {
+@@ -394,6 +394,7 @@ mains_charger: dc-charger {
  
  &cdn_dp {
  	status = "okay";
@@ -22,7 +22,7 @@ index decb212e2dca..37f967a89401 100644
  };
  
  &cpu_b0 {
-@@ -735,6 +736,9 @@ connector {
+@@ -728,6 +729,9 @@ connector {
  				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
  			try-power-role = "sink";
  
@@ -32,7 +32,7 @@ index decb212e2dca..37f967a89401 100644
  			ports {
  				#address-cells = <1>;
  				#size-cells = <0>;
-@@ -1002,6 +1006,7 @@ spiflash: flash@0 {
+@@ -995,6 +999,7 @@ spiflash: flash@0 {
  };
  
  &tcphy0 {
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch b/gnu/packages/patches/linux-libre-pinebook-pro-19-arm64-dts-rockchip-add-rockchip-suspend-node.patch
index ae4f87c58b..1bec58402e 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-19-arm64-dts-rockchip-add-rockchip-suspend-node.patch
@@ -1,7 +1,7 @@
-From 023580a728ab485abf5d638f0c928b106804f8ac Mon Sep 17 00:00:00 2001
+From 3cb1a4675a9d516906028371baa01ee8b504cebe Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 14:44:40 +0200
-Subject: [PATCH 21/25] arm64: dts: rockchip: add rockchip-suspend node
+Subject: [PATCH 19/22] arm64: dts: rockchip: add rockchip-suspend node
 
 No mainline
 
@@ -11,10 +11,10 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
  1 file changed, 23 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index 37f967a89401..c505c88b5d9b 100644
+index 7c5bca24481c..36f66cbee142 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -954,6 +954,29 @@ &pwm2 {
+@@ -947,6 +947,29 @@ &pwm2 {
  	status = "okay";
  };
  
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch b/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
index 93dc8cd8ed..8e84655144 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
@@ -1,20 +1,22 @@
-From 9533f83b4cd0e3372aa574d9c903efea37a07a05 Mon Sep 17 00:00:00 2001
+From dbfbe37af60500660395b1ca29899ff52d045fe2 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Thu, 28 May 2020 15:20:15 +0200
-Subject: [PATCH 22/25] arm64: configs: add defconfig for Pinebook Pro
+Subject: [PATCH 20/22] arm64: configs: add defconfig for Pinebook Pro
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
+
+arm64: configs: Update Pinbook Pro defconfig to v5.8-rc1
 ---
- arch/arm64/configs/pinebook_pro_defconfig | 3000 +++++++++++++++++++++
- 1 file changed, 3000 insertions(+)
+ arch/arm64/configs/pinebook_pro_defconfig | 2994 +++++++++++++++++++++
+ 1 file changed, 2994 insertions(+)
  create mode 100644 arch/arm64/configs/pinebook_pro_defconfig
 
 diff --git a/arch/arm64/configs/pinebook_pro_defconfig b/arch/arm64/configs/pinebook_pro_defconfig
 new file mode 100644
-index 000000000000..bc7bcee200e4
+index 000000000000..2977cea49142
 --- /dev/null
 +++ b/arch/arm64/configs/pinebook_pro_defconfig
-@@ -0,0 +1,3000 @@
+@@ -0,0 +1,2994 @@
 +CONFIG_LOCALVERSION="-MANJARO-ARM"
 +# CONFIG_LOCALVERSION_AUTO is not set
 +CONFIG_SYSVIPC=y
@@ -34,7 +36,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=15
 +CONFIG_MEMCG=y
-+CONFIG_MEMCG_SWAP=y
 +CONFIG_BLK_CGROUP=y
 +CONFIG_CFS_BANDWIDTH=y
 +CONFIG_CGROUP_PIDS=y
@@ -645,6 +646,7 @@ index 000000000000..bc7bcee200e4
 +CONFIG_PCI=y
 +CONFIG_PCIEPORTBUS=y
 +CONFIG_HOTPLUG_PCI_PCIE=y
++CONFIG_PCIEAER=y
 +CONFIG_PCIEAER_INJECT=m
 +CONFIG_PCIE_ECRC=y
 +CONFIG_PCI_STUB=y
@@ -1246,7 +1248,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_INPUT_MISC=y
 +CONFIG_INPUT_E3X0_BUTTON=m
 +CONFIG_INPUT_MMA8450=m
-+CONFIG_INPUT_GP2A=m
 +CONFIG_INPUT_ATI_REMOTE2=m
 +CONFIG_INPUT_KEYSPAN_REMOTE=m
 +CONFIG_INPUT_KXTJ9=m
@@ -1267,6 +1268,7 @@ index 000000000000..bc7bcee200e4
 +# CONFIG_LEGACY_PTYS is not set
 +CONFIG_SERIAL_8250=y
 +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
++# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
 +CONFIG_SERIAL_8250_CONSOLE=y
 +CONFIG_SERIAL_8250_NR_UARTS=32
 +CONFIG_SERIAL_8250_EXTENDED=y
@@ -1595,18 +1597,13 @@ index 000000000000..bc7bcee200e4
 +CONFIG_IR_SERIAL_TRANSMITTER=y
 +CONFIG_IR_SIR=m
 +CONFIG_RC_XBOX_DVD=m
-+CONFIG_MEDIA_SUPPORT=y
-+CONFIG_MEDIA_CAMERA_SUPPORT=y
-+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-+CONFIG_MEDIA_RADIO_SUPPORT=y
-+CONFIG_MEDIA_SDR_SUPPORT=y
-+CONFIG_MEDIA_CEC_SUPPORT=y
 +CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
++CONFIG_USB_PULSE8_CEC=m
++CONFIG_USB_RAINSHADOW_CEC=m
++CONFIG_MEDIA_SUPPORT=y
++CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 +CONFIG_VIDEO_V4L2_SUBDEV_API=y
 +CONFIG_DVB_MAX_ADAPTERS=8
-+CONFIG_DVB_DYNAMIC_MINORS=y
 +CONFIG_MEDIA_USB_SUPPORT=y
 +CONFIG_USB_VIDEO_CLASS=m
 +CONFIG_USB_M5602=m
@@ -1727,8 +1724,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_VIDEO_EM28XX_DVB=m
 +CONFIG_USB_AIRSPY=m
 +CONFIG_USB_HACKRF=m
-+CONFIG_USB_PULSE8_CEC=m
-+CONFIG_USB_RAINSHADOW_CEC=m
 +CONFIG_MEDIA_PCI_SUPPORT=y
 +CONFIG_VIDEO_SOLO6X10=m
 +CONFIG_VIDEO_TW68=m
@@ -1773,10 +1768,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_DVB_NGENE=m
 +CONFIG_DVB_DDBRIDGE=m
 +CONFIG_DVB_SMIPCIE=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_V4L_MEM2MEM_DRIVERS=y
-+CONFIG_VIDEO_ROCKCHIP_RGA=m
-+CONFIG_SMS_SDIO_DRV=m
 +CONFIG_RADIO_SI470X=m
 +CONFIG_USB_SI470X=m
 +CONFIG_I2C_SI470X=m
@@ -1795,6 +1786,11 @@ index 000000000000..bc7bcee200e4
 +CONFIG_RADIO_SAA7706H=m
 +CONFIG_RADIO_TEF6862=m
 +CONFIG_RADIO_WL1273=m
++CONFIG_V4L_PLATFORM_DRIVERS=y
++CONFIG_V4L_MEM2MEM_DRIVERS=y
++CONFIG_VIDEO_ROCKCHIP_RGA=m
++CONFIG_SMS_SDIO_DRV=m
++CONFIG_DVB_DUMMY_FE=m
 +CONFIG_DRM=m
 +CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 +CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -1816,7 +1812,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_DRM_UDL=m
 +CONFIG_DRM_AST=m
 +CONFIG_DRM_MGAG200=m
-+CONFIG_DRM_CIRRUS_QEMU=m
 +CONFIG_DRM_QXL=m
 +CONFIG_DRM_BOCHS=m
 +CONFIG_DRM_VIRTIO_GPU=m
@@ -1834,6 +1829,7 @@ index 000000000000..bc7bcee200e4
 +CONFIG_DRM_I2C_ADV7511_AUDIO=y
 +CONFIG_DRM_DW_HDMI_CEC=m
 +CONFIG_DRM_HISI_KIRIN=m
++CONFIG_DRM_CIRRUS_QEMU=m
 +CONFIG_DRM_PL111=m
 +CONFIG_DRM_PANFROST=m
 +CONFIG_FB=y
@@ -2361,6 +2357,7 @@ index 000000000000..bc7bcee200e4
 +CONFIG_RTC_DRV_V3020=m
 +CONFIG_RTC_DRV_CROS_EC=y
 +CONFIG_RTC_DRV_PL031=y
++CONFIG_DMADEVICES=y
 +CONFIG_MV_XOR_V2=y
 +CONFIG_PL330_DMA=y
 +CONFIG_QCOM_HIDMA_MGMT=y
@@ -2408,6 +2405,7 @@ index 000000000000..bc7bcee200e4
 +CONFIG_AD2S1210=m
 +CONFIG_STAGING_MEDIA=y
 +CONFIG_VIDEO_HANTRO=y
++CONFIG_VIDEO_ROCKCHIP_VDEC=m
 +CONFIG_VIDEO_USBVISION=m
 +CONFIG_FB_TFT=m
 +CONFIG_FB_TFT_AGM1264K_FL=m
@@ -2451,9 +2449,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_CROS_EC_VBC=m
 +CONFIG_CROS_EC_DEBUGFS=m
 +CONFIG_CROS_EC_SYSFS=m
-+CONFIG_COMMON_CLK_VERSATILE=y
-+CONFIG_CLK_SP810=y
-+CONFIG_CLK_VEXPRESS_OSC=y
 +CONFIG_COMMON_CLK_RK808=y
 +CONFIG_COMMON_CLK_SCPI=y
 +CONFIG_COMMON_CLK_XGENE=y
@@ -2930,7 +2925,6 @@ index 000000000000..bc7bcee200e4
 +CONFIG_DLM=m
 +CONFIG_DLM_DEBUG=y
 +CONFIG_PERSISTENT_KEYRINGS=y
-+CONFIG_BIG_KEYS=y
 +CONFIG_TRUSTED_KEYS=m
 +CONFIG_ENCRYPTED_KEYS=y
 +CONFIG_SECURITY=y
@@ -2943,7 +2937,9 @@ index 000000000000..bc7bcee200e4
 +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 +CONFIG_CRYPTO_PCRYPT=m
 +CONFIG_CRYPTO_DH=m
++CONFIG_CRYPTO_GCM=y
 +CONFIG_CRYPTO_AEGIS128=m
++CONFIG_CRYPTO_SEQIV=y
 +CONFIG_CRYPTO_CFB=m
 +CONFIG_CRYPTO_LRW=m
 +CONFIG_CRYPTO_OFB=m
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch b/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
index 941ba59d6c..a6d48766e3 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
@@ -1,7 +1,7 @@
-From 6a33e51351f2ac8135c99f2640aefaf000116d3c Mon Sep 17 00:00:00 2001
+From d82f08c93de578e9f804454950afcf0ea05f4c23 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Sat, 6 Jun 2020 23:45:10 +0200
-Subject: [PATCH 23/25] arm64: dts: rockchip: setup USB type c port as dual
+Subject: [PATCH 21/22] arm64: dts: rockchip: setup USB type c port as dual
  data role
 
 Some chargers try to put the charged device into device data role.
@@ -14,10 +14,10 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index c505c88b5d9b..d77dca5524ff 100644
+index 36f66cbee142..6177d3a0e272 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -726,7 +726,7 @@ fusb0: fusb30x@22 {
+@@ -719,7 +719,7 @@ fusb0: fusb30x@22 {
  
  		connector {
  			compatible = "usb-c-connector";
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch b/gnu/packages/patches/linux-libre-pinebook-pro-22-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
index 601301d4b3..68c21da3ab 100644
--- a/gnu/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
+++ b/gnu/packages/patches/linux-libre-pinebook-pro-22-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
@@ -1,7 +1,7 @@
-From e635f9ae42726f2db386558c7f0b1470fec3e734 Mon Sep 17 00:00:00 2001
+From b867286f70ce1368a0536ba45846f318473736e0 Mon Sep 17 00:00:00 2001
 From: Tobias Schramm <t.schramm@manjaro.org>
 Date: Tue, 16 Jun 2020 21:29:29 +0200
-Subject: [PATCH 25/25] soc: rockchip: Port rockchip_pm_config driver to Linux
+Subject: [PATCH 22/22] soc: rockchip: Port rockchip_pm_config driver to Linux
  5.8
 
 Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
diff --git a/gnu/packages/patches/linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch b/gnu/packages/patches/linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch
deleted file mode 100644
index 00dc4da237..0000000000
--- a/gnu/packages/patches/linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 4116a1941d454e9a629f689b73154549832af5d6 Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Tue, 16 Jun 2020 10:11:10 +0200
-Subject: [PATCH 24/25] arm64: configs: Update Pinbook Pro defconfig to
- v5.8-rc1
-
----
- arch/arm64/configs/pinebook_pro_defconfig | 38 ++++++++++-------------
- 1 file changed, 16 insertions(+), 22 deletions(-)
-
-diff --git a/arch/arm64/configs/pinebook_pro_defconfig b/arch/arm64/configs/pinebook_pro_defconfig
-index bc7bcee200e4..2977cea49142 100644
---- a/arch/arm64/configs/pinebook_pro_defconfig
-+++ b/arch/arm64/configs/pinebook_pro_defconfig
-@@ -17,7 +17,6 @@ CONFIG_LOG_BUF_SHIFT=23
- CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
- CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=15
- CONFIG_MEMCG=y
--CONFIG_MEMCG_SWAP=y
- CONFIG_BLK_CGROUP=y
- CONFIG_CFS_BANDWIDTH=y
- CONFIG_CGROUP_PIDS=y
-@@ -628,6 +627,7 @@ CONFIG_NFC_ST21NFCA_I2C=m
- CONFIG_PCI=y
- CONFIG_PCIEPORTBUS=y
- CONFIG_HOTPLUG_PCI_PCIE=y
-+CONFIG_PCIEAER=y
- CONFIG_PCIEAER_INJECT=m
- CONFIG_PCIE_ECRC=y
- CONFIG_PCI_STUB=y
-@@ -1229,7 +1229,6 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
- CONFIG_INPUT_MISC=y
- CONFIG_INPUT_E3X0_BUTTON=m
- CONFIG_INPUT_MMA8450=m
--CONFIG_INPUT_GP2A=m
- CONFIG_INPUT_ATI_REMOTE2=m
- CONFIG_INPUT_KEYSPAN_REMOTE=m
- CONFIG_INPUT_KXTJ9=m
-@@ -1250,6 +1249,7 @@ CONFIG_SERIO_ARC_PS2=m
- # CONFIG_LEGACY_PTYS is not set
- CONFIG_SERIAL_8250=y
- # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
- CONFIG_SERIAL_8250_CONSOLE=y
- CONFIG_SERIAL_8250_NR_UARTS=32
- CONFIG_SERIAL_8250_EXTENDED=y
-@@ -1578,18 +1578,13 @@ CONFIG_IR_SERIAL=m
- CONFIG_IR_SERIAL_TRANSMITTER=y
- CONFIG_IR_SIR=m
- CONFIG_RC_XBOX_DVD=m
--CONFIG_MEDIA_SUPPORT=y
--CONFIG_MEDIA_CAMERA_SUPPORT=y
--CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
--CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
--CONFIG_MEDIA_RADIO_SUPPORT=y
--CONFIG_MEDIA_SDR_SUPPORT=y
--CONFIG_MEDIA_CEC_SUPPORT=y
- CONFIG_MEDIA_CEC_RC=y
--CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
-+CONFIG_USB_PULSE8_CEC=m
-+CONFIG_USB_RAINSHADOW_CEC=m
-+CONFIG_MEDIA_SUPPORT=y
-+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
- CONFIG_VIDEO_V4L2_SUBDEV_API=y
- CONFIG_DVB_MAX_ADAPTERS=8
--CONFIG_DVB_DYNAMIC_MINORS=y
- CONFIG_MEDIA_USB_SUPPORT=y
- CONFIG_USB_VIDEO_CLASS=m
- CONFIG_USB_M5602=m
-@@ -1710,8 +1705,6 @@ CONFIG_VIDEO_EM28XX_ALSA=m
- CONFIG_VIDEO_EM28XX_DVB=m
- CONFIG_USB_AIRSPY=m
- CONFIG_USB_HACKRF=m
--CONFIG_USB_PULSE8_CEC=m
--CONFIG_USB_RAINSHADOW_CEC=m
- CONFIG_MEDIA_PCI_SUPPORT=y
- CONFIG_VIDEO_SOLO6X10=m
- CONFIG_VIDEO_TW68=m
-@@ -1756,10 +1749,6 @@ CONFIG_DVB_HOPPER=m
- CONFIG_DVB_NGENE=m
- CONFIG_DVB_DDBRIDGE=m
- CONFIG_DVB_SMIPCIE=m
--CONFIG_V4L_PLATFORM_DRIVERS=y
--CONFIG_V4L_MEM2MEM_DRIVERS=y
--CONFIG_VIDEO_ROCKCHIP_RGA=m
--CONFIG_SMS_SDIO_DRV=m
- CONFIG_RADIO_SI470X=m
- CONFIG_USB_SI470X=m
- CONFIG_I2C_SI470X=m
-@@ -1778,6 +1767,11 @@ CONFIG_RADIO_TEA5764=m
- CONFIG_RADIO_SAA7706H=m
- CONFIG_RADIO_TEF6862=m
- CONFIG_RADIO_WL1273=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_V4L_MEM2MEM_DRIVERS=y
-+CONFIG_VIDEO_ROCKCHIP_RGA=m
-+CONFIG_SMS_SDIO_DRV=m
-+CONFIG_DVB_DUMMY_FE=m
- CONFIG_DRM=m
- CONFIG_DRM_LOAD_EDID_FIRMWARE=y
- CONFIG_DRM_I2C_NXP_TDA998X=m
-@@ -1799,7 +1793,6 @@ CONFIG_ROCKCHIP_RGB=y
- CONFIG_DRM_UDL=m
- CONFIG_DRM_AST=m
- CONFIG_DRM_MGAG200=m
--CONFIG_DRM_CIRRUS_QEMU=m
- CONFIG_DRM_QXL=m
- CONFIG_DRM_BOCHS=m
- CONFIG_DRM_VIRTIO_GPU=m
-@@ -1817,6 +1810,7 @@ CONFIG_DRM_I2C_ADV7511=m
- CONFIG_DRM_I2C_ADV7511_AUDIO=y
- CONFIG_DRM_DW_HDMI_CEC=m
- CONFIG_DRM_HISI_KIRIN=m
-+CONFIG_DRM_CIRRUS_QEMU=m
- CONFIG_DRM_PL111=m
- CONFIG_DRM_PANFROST=m
- CONFIG_FB=y
-@@ -2344,6 +2338,7 @@ CONFIG_RTC_DRV_RP5C01=m
- CONFIG_RTC_DRV_V3020=m
- CONFIG_RTC_DRV_CROS_EC=y
- CONFIG_RTC_DRV_PL031=y
-+CONFIG_DMADEVICES=y
- CONFIG_MV_XOR_V2=y
- CONFIG_PL330_DMA=y
- CONFIG_QCOM_HIDMA_MGMT=y
-@@ -2391,6 +2386,7 @@ CONFIG_ADE7854=m
- CONFIG_AD2S1210=m
- CONFIG_STAGING_MEDIA=y
- CONFIG_VIDEO_HANTRO=y
-+CONFIG_VIDEO_ROCKCHIP_VDEC=m
- CONFIG_VIDEO_USBVISION=m
- CONFIG_FB_TFT=m
- CONFIG_FB_TFT_AGM1264K_FL=m
-@@ -2434,9 +2430,6 @@ CONFIG_CROS_EC_LIGHTBAR=m
- CONFIG_CROS_EC_VBC=m
- CONFIG_CROS_EC_DEBUGFS=m
- CONFIG_CROS_EC_SYSFS=m
--CONFIG_COMMON_CLK_VERSATILE=y
--CONFIG_CLK_SP810=y
--CONFIG_CLK_VEXPRESS_OSC=y
- CONFIG_COMMON_CLK_RK808=y
- CONFIG_COMMON_CLK_SCPI=y
- CONFIG_COMMON_CLK_XGENE=y
-@@ -2913,7 +2906,6 @@ CONFIG_NLS_MAC_TURKISH=m
- CONFIG_DLM=m
- CONFIG_DLM_DEBUG=y
- CONFIG_PERSISTENT_KEYRINGS=y
--CONFIG_BIG_KEYS=y
- CONFIG_TRUSTED_KEYS=m
- CONFIG_ENCRYPTED_KEYS=y
- CONFIG_SECURITY=y
-@@ -2926,7 +2918,9 @@ CONFIG_CRYPTO_USER=m
- # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
- CONFIG_CRYPTO_PCRYPT=m
- CONFIG_CRYPTO_DH=m
-+CONFIG_CRYPTO_GCM=y
- CONFIG_CRYPTO_AEGIS128=m
-+CONFIG_CRYPTO_SEQIV=y
- CONFIG_CRYPTO_CFB=m
- CONFIG_CRYPTO_LRW=m
- CONFIG_CRYPTO_OFB=m
--- 
-2.30.0
-