[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: linux-libre-pinebook-pro: Update to 5.10.
|
From: |
guix-commits |
|
Subject: |
03/03: gnu: linux-libre-pinebook-pro: Update to 5.10. |
|
Date: |
Mon, 25 Jan 2021 21:11:41 -0500 (EST) |
vagrantc pushed a commit to branch wip-pinebook-pro
in repository guix.
commit 6d31bc7e3fcb57bb62b52092f357b163ec63a496
Author: Vagrant Cascadian <vagrant@debian.org>
AuthorDate: Mon Jan 25 16:49:12 2021 -0800
gnu: linux-libre-pinebook-pro: Update to 5.10.
* gnu/packages/linux (linux-libre-pinebook-pro): Update to 5.10.
(%pinebook-pro-patches): Update to 5.10.
* gnu/packages/patches: Update patches.
* gnu/local.mk: Update patches.
---
gnu/local.mk | 50 ++++++++---------
gnu/packages/linux.scm | 64 ++++++++++-----------
...ds-Add-support-for-inverted-LED-triggers.patch} | 65 +++++++++++++---------
...ockchip-Add-rockchip-suspend-mode-driver.patch} | 16 +++---
...-pro-03-firmware-Add-Rockchip-SIP-driver.patch} | 12 ++--
...ok-pro-04-tty-serdev-support-shutdown-op.patch} | 6 +-
...i_serdev-Clear-registered-bit-on-unregis.patch} | 16 +++---
...etooth-hci_bcm-disable-power-on-shutdown.patch} | 6 +-
...seq_simple-disable-mmc-power-on-shutdown.patch} | 6 +-
...-core-add-generic-suspend-states-support.patch} | 36 +++++-------
...us-Catch-crash-due-to-partner-NULL-value.patch} | 6 +-
...c-tcpm-add-hacky-generic-altmode-support.patch} | 55 +++++++++---------
...y-rockchip-typec-Set-extcon-capabilities.patch} | 8 +--
...tmodes-displayport-Add-hacky-generic-alt.patch} | 16 +++---
...decs-es8316-Run-micdetect-only-if-jack-s.patch} | 10 ++--
...k.c-supported-inverted-jack-detect-GPIOs.patch} | 6 +-
...ckchip-add-default-rk3399-rockchip-suspe.patch} | 10 ++--
...ro-16-arm64-dts-rockchip-enable-earlycon.patch} | 8 +--
...ckchip-reserve-memory-for-ATF-rockchip-S.patch} | 10 ++--
...ckchip-use-power-led-for-disk-activity-i.patch} | 8 +--
...arm64-dts-rockchip-add-typec-extcon-hack.patch} | 8 +--
...4-dts-rockchip-add-rockchip-suspend-node.patch} | 8 +--
...4-configs-add-defconfig-for-Pinebook-Pro.patch} | 6 +-
...ckchip-setup-USB-type-c-port-as-dual-dat.patch} | 8 +--
...s-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch} | 6 +-
...-Port-rockchip_pm_config-driver-to-Linux.patch} | 6 +-
...-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch | 56 -------------------
...ockchip-add-oficially-unsupported-2GHz-op.patch | 34 -----------
28 files changed, 231 insertions(+), 315 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 4cc53db..e05816d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1316,6 +1316,30 @@ 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-pam-no-setfsuid.patch \
%D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/lirc-reproducible-build.patch \
@@ -1438,32 +1462,6 @@ dist_patch_DATA =
\
%D%/packages/patches/osip-CVE-2017-7853.patch \
%D%/packages/patches/ots-no-include-missing-file.patch \
%D%/packages/patches/owncloud-disable-updatecheck.patch \
-
%D%/packages/patches/pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch
\
-
%D%/packages/patches/pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
\
- %D%/packages/patches/pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
\
- %D%/packages/patches/pinebook-pro-04-tty-serdev-support-shutdown-op.patch
\
-
%D%/packages/patches/pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
\
-
%D%/packages/patches/pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
\
-
%D%/packages/patches/pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
\
-
%D%/packages/patches/pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
\
-
%D%/packages/patches/pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
\
-
%D%/packages/patches/pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
\
-
%D%/packages/patches/pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
\
-
%D%/packages/patches/pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
\
-
%D%/packages/patches/pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
\
-
%D%/packages/patches/pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
\
-
%D%/packages/patches/pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
\
-
%D%/packages/patches/pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
\
-
%D%/packages/patches/pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
\
-
%D%/packages/patches/pinebook-pro-18-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch
\
-
%D%/packages/patches/pinebook-pro-19-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
\
-
%D%/packages/patches/pinebook-pro-20-arm64-dts-rockchip-add-oficially-unsupported-2GHz-op.patch
\
-
%D%/packages/patches/pinebook-pro-21-arm64-dts-rockchip-add-typec-extcon-hack.patch
\
-
%D%/packages/patches/pinebook-pro-22-arm64-dts-rockchip-add-rockchip-suspend-node.patch
\
-
%D%/packages/patches/pinebook-pro-23-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
\
-
%D%/packages/patches/pinebook-pro-24-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
\
-
%D%/packages/patches/pinebook-pro-25-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch
\
-
%D%/packages/patches/pinebook-pro-26-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
\
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3b31975..ea088b0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -458,36 +458,34 @@ corresponding UPSTREAM-SOURCE (an origin), using the
given DEBLOB-SCRIPTS."
(base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"))))
(define %pinebook-pro-patches
- ;; Pinebook Pro patches from manjaro 5.8-rc1 branch:
+ ;; Pinebook Pro patches from manjaro v5.10 branch:
;; https://gitlab.manjaro.org/tsys/linux-pinebook-pro.git
- ;; branch v5.8-rc1
+ ;; Rebased for 5.10.9
(search-patches
- "pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch"
- "pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch"
- "pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch"
- "pinebook-pro-04-tty-serdev-support-shutdown-op.patch"
- "pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch"
- "pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch"
- "pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch"
- "pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch"
- "pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch"
- "pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch"
- "pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch"
- "pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch"
- "pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch"
- "pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch"
- "pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch"
- "pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch"
- "pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch"
- "pinebook-pro-18-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch"
- "pinebook-pro-19-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch"
- "pinebook-pro-20-arm64-dts-rockchip-add-oficially-unsupported-2GHz-op.patch"
- "pinebook-pro-21-arm64-dts-rockchip-add-typec-extcon-hack.patch"
- "pinebook-pro-22-arm64-dts-rockchip-add-rockchip-suspend-node.patch"
- "pinebook-pro-23-arm64-configs-add-defconfig-for-Pinebook-Pro.patch"
- "pinebook-pro-24-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch"
- "pinebook-pro-25-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch"
-
"pinebook-pro-26-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch"))
+
"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"))
(define (source-with-patches source patches)
(origin
@@ -1082,9 +1080,13 @@ It has been modified to remove all non-free binary
blobs.")
(inherit base-linux-libre)
(inputs `(("cpio" ,cpio) ,@(package-inputs base-linux-libre))))))
-(define-public linux-libre-pinebook-pro-5.8
- (make-linux-libre* linux-libre-5.8-version
- linux-libre-5.8-source
+(define-public linux-libre-pinebook-pro
+ (make-linux-libre* linux-libre-5.10-version
+ (source-with-patches linux-libre-5.10-pristine-source
+ (append
+ %pinebook-pro-patches
+ (list %boot-logo-patch
+
%linux-libre-arm-export-__sync_icache_dcache-patch)))
'("aarch64-linux")
#:defconfig "pinebook_pro_defconfig"
#:extra-version "pinebook-pro"))
diff --git
a/gnu/packages/patches/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
similarity index 80%
rename from
gnu/packages/patches/pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-01-leds-Add-support-for-inverted-LED-triggers.patch
index 2e1e250..9b3239d 100644
---
a/gnu/packages/patches/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
@@ -1,22 +1,22 @@
-From ce1fd4c30259779c058c52c1471f6fdb718fd3a5 Mon Sep 17 00:00:00 2001
+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/26] leds: Add support for inverted LED triggers
+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 | 148 +++++++++++++++++++++++++++---------
+ drivers/leds/led-triggers.c | 149 +++++++++++++++++++++++++++---------
include/linux/leds.h | 1 +
- 3 files changed, 112 insertions(+), 38 deletions(-)
+ 3 files changed, 113 insertions(+), 38 deletions(-)
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
-index f1f718dbe0f8..f174611e869f 100644
+index c4e780bdb385..3973676d6f1e 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
-@@ -175,6 +175,7 @@ static void led_blink_setup(struct led_classdev *led_cdev,
+@@ -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) &&
@@ -25,13 +25,21 @@ index f1f718dbe0f8..f174611e869f 100644
!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 79e30d2cb7a5..c40c58c6e345 100644
+index 91da90cfb11d..7f2898a0e1e3 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
-@@ -27,14 +27,80 @@ LIST_HEAD(trigger_list);
+@@ -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"
+
+/*
@@ -73,7 +81,8 @@ index 79e30d2cb7a5..c40c58c6e345 100644
+ 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)) {
++ !strncmp(trigname, trig->name, len) &&
++ trigger_relevant(led_cdev, trig)) {
+ if (lock)
+ down_write(&led_cdev->trigger_lock);
+ led_trigger_set(led_cdev, trig);
@@ -110,13 +119,13 @@ index 79e30d2cb7a5..c40c58c6e345 100644
mutex_lock(&led_cdev->led_access);
-@@ -48,20 +114,10 @@ ssize_t led_trigger_write(struct file *filp, struct
kobject *kobj,
+@@ -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)) {
+- 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);
@@ -135,15 +144,18 @@ index 79e30d2cb7a5..c40c58c6e345 100644
unlock:
mutex_unlock(&led_cdev->led_access);
-@@ -93,12 +149,22 @@ static int led_trigger_format(char *buf, size_t size,
+@@ -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 = led_cdev->trigger &&
-- !strcmp(led_cdev->trigger->name, trig->name);
+- 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",
@@ -162,7 +174,7 @@ index 79e30d2cb7a5..c40c58c6e345 100644
}
len += led_trigger_snprintf(buf + len, size - len, "\n");
-@@ -235,21 +301,15 @@ EXPORT_SYMBOL_GPL(led_trigger_remove);
+@@ -245,22 +313,15 @@ EXPORT_SYMBOL_GPL(led_trigger_remove);
void led_trigger_set_default(struct led_classdev *led_cdev)
{
@@ -175,7 +187,8 @@ index 79e30d2cb7a5..c40c58c6e345 100644
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)) {
+- 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;
@@ -188,18 +201,18 @@ index 79e30d2cb7a5..c40c58c6e345 100644
up_read(&triggers_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_set_default);
-@@ -292,11 +352,14 @@ int led_trigger_register(struct led_trigger *trig)
+@@ -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)) {
+ 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);
-+ if (!led_cdev->trigger && led_cdev->default_trigger) {
+ found = !led_trigger_set_str_unlocked(led_cdev,
+ led_cdev->default_trigger);
+ if (found)
@@ -207,7 +220,7 @@ index 79e30d2cb7a5..c40c58c6e345 100644
}
up_write(&led_cdev->trigger_lock);
}
-@@ -369,8 +432,14 @@ void led_trigger_event(struct led_trigger *trig,
+@@ -383,8 +447,14 @@ void led_trigger_event(struct led_trigger *trig,
return;
read_lock(&trig->leddev_list_lock);
@@ -224,7 +237,7 @@ index 79e30d2cb7a5..c40c58c6e345 100644
read_unlock(&trig->leddev_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_event);
-@@ -388,10 +457,13 @@ static void led_trigger_blink_setup(struct led_trigger
*trig,
+@@ -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) {
@@ -242,10 +255,10 @@ index 79e30d2cb7a5..c40c58c6e345 100644
}
read_unlock(&trig->leddev_list_lock);
diff --git a/include/linux/leds.h b/include/linux/leds.h
-index 2451962d1ec5..c15298502b39 100644
+index 6a8d6409c993..9cbf42cf08e8 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
-@@ -75,6 +75,7 @@ struct led_classdev {
+@@ -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)
@@ -254,5 +267,5 @@ index 2451962d1ec5..c15298502b39 100644
/* set_brightness_work / blink_timer flags, atomic, private. */
unsigned long work_flags;
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
similarity index 97%
rename from
gnu/packages/patches/pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
index e643b77..27e3865 100644
---
a/gnu/packages/patches/pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-02-soc-rockchip-Add-rockchip-suspend-mode-driver.patch
@@ -1,7 +1,7 @@
-From 647fe78ac65a505aefff3825760185d66ada0da2 Mon Sep 17 00:00:00 2001
+From 3248fd8a16fd3815de2f66a4693eabdb8ceae6b8 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/26] soc: rockchip: Add rockchip suspend mode driver
+Subject: [PATCH 02/25] soc: rockchip: Add rockchip suspend mode driver
Code gore, do not mainline. This belongs in ATF
@@ -63,10 +63,10 @@ index 000000000000..a8fd70f17597
+ >;
+ };
diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig
-index b71b73bf5fc5..bfadbecd0df8 100644
+index 2c13bf4dd5db..f403ab803b42 100644
--- a/drivers/soc/rockchip/Kconfig
+++ b/drivers/soc/rockchip/Kconfig
-@@ -26,4 +26,10 @@ config ROCKCHIP_PM_DOMAINS
+@@ -34,4 +34,10 @@ config ROCKCHIP_PM_DOMAINS
If unsure, say N.
@@ -78,12 +78,12 @@ index b71b73bf5fc5..bfadbecd0df8 100644
+
endif
diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile
-index afca0a4c4b72..a15c0a395a33 100644
+index 875032f7344e..7aa3d5d1b330 100644
--- a/drivers/soc/rockchip/Makefile
+++ b/drivers/soc/rockchip/Makefile
-@@ -4,3 +4,4 @@
- #
+@@ -5,3 +5,4 @@
obj-$(CONFIG_ROCKCHIP_GRF) += grf.o
+ obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o
obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o
+obj-$(CONFIG_ROCKCHIP_SUSPEND_MODE) += rockchip_pm_config.o
diff --git a/drivers/soc/rockchip/rockchip_pm_config.c
b/drivers/soc/rockchip/rockchip_pm_config.c
@@ -371,5 +371,5 @@ index 000000000000..0cccd6430ef6
+
+#endif
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
similarity index 98%
rename from
gnu/packages/patches/pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
index 2e87bcb..f43482d 100644
---
a/gnu/packages/patches/pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-03-firmware-Add-Rockchip-SIP-driver.patch
@@ -1,7 +1,7 @@
-From 6d5c59818c17acdb798be77487c99b5f2dd26be0 Mon Sep 17 00:00:00 2001
+From 5e12e8a5194513d83fd45c4e765b7bc81ee3ee0a 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/26] firmware: Add Rockchip SIP driver
+Subject: [PATCH 03/25] firmware: Add Rockchip SIP driver
Used exclusively for suspend signaling. Drop for mainline and
use PSCI
@@ -17,10 +17,10 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
create mode 100644 include/linux/rockchip/rockchip_sip.h
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
-index fbd785dd0513..da0c3183e48a 100644
+index 3315e3c21586..1dfa18dde097 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
-@@ -251,6 +251,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
+@@ -250,6 +250,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
Say Y here to enable "download mode" by default.
@@ -35,7 +35,7 @@ index fbd785dd0513..da0c3183e48a 100644
tristate "TI System Control Interface (TISCI) Message Protocol"
depends on TI_MESSAGE_MANAGER
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
-index 99510be9f5ed..5533d2ffae54 100644
+index 5e013b6a3692..85c40483e5fa 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -28,6 +28,7 @@ obj-y += meson/
@@ -470,5 +470,5 @@ index 000000000000..b19f64ede981
+
+#endif
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-04-tty-serdev-support-shutdown-op.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch
similarity index 92%
rename from
gnu/packages/patches/pinebook-pro-04-tty-serdev-support-shutdown-op.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch
index 1b30557..72be835 100644
--- a/gnu/packages/patches/pinebook-pro-04-tty-serdev-support-shutdown-op.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-04-tty-serdev-support-shutdown-op.patch
@@ -1,7 +1,7 @@
-From 9ef294895cf135238269e12457f104a42397b59b Mon Sep 17 00:00:00 2001
+From 2bbf6948fa674a86e1c101112455e7323b84dfe7 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/26] tty: serdev: support shutdown op
+Subject: [PATCH 04/25] tty: serdev: support shutdown op
Allow serdev drivers to register a shutdown handler
@@ -51,5 +51,5 @@ index 9f14f9c12ec4..94050561325c 100644
static inline struct serdev_device_driver *to_serdev_device_driver(struct
device_driver *d)
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
similarity index 60%
rename from
gnu/packages/patches/pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
index 08d2943..715c8ad 100644
---
a/gnu/packages/patches/pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-05-bluetooth-hci_serdev-Clear-registered-bit-on-unregis.patch
@@ -1,7 +1,7 @@
-From e31835178104ce7e82d2a573f80ea953bfb3012c Mon Sep 17 00:00:00 2001
+From 6f76ad0bf7508186247a2a02ad22450c0b6244bf 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/26] bluetooth: hci_serdev: Clear registered bit on
+Subject: [PATCH 05/25] bluetooth: hci_serdev: Clear registered bit on
unregister
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
@@ -10,17 +10,17 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 2 insertions(+)
diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c
-index 599855e4c57c..1ef9b965a9a0 100644
+index ef96ad06fa54..95c723c0ea01 100644
--- a/drivers/bluetooth/hci_serdev.c
+++ b/drivers/bluetooth/hci_serdev.c
-@@ -362,5 +362,7 @@ void hci_uart_unregister_device(struct hci_uart *hu)
-
- hu->proto->close(hu);
- serdev_device_close(hu->serdev);
+@@ -395,5 +395,7 @@ void hci_uart_unregister_device(struct hci_uart *hu)
+ clear_bit(HCI_UART_PROTO_READY, &hu->flags);
+ serdev_device_close(hu->serdev);
+ }
+
+ clear_bit(HCI_UART_REGISTERED, &hu->flags);
}
EXPORT_SYMBOL_GPL(hci_uart_unregister_device);
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
similarity index 91%
rename from
gnu/packages/patches/pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
index 93c19b6..6d915f7 100644
---
a/gnu/packages/patches/pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-06-bluetooth-hci_bcm-disable-power-on-shutdown.patch
@@ -1,7 +1,7 @@
-From 05f517f27ef921bace9197ed89f9a65108c3fddf Mon Sep 17 00:00:00 2001
+From 0864be1539abd7d484d70b9644e1aae5493762cc 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/26] bluetooth: hci_bcm: disable power on shutdown
+Subject: [PATCH 06/25] bluetooth: hci_bcm: disable power on shutdown
Firmware behaves wonky when not power cycled over reboots
@@ -47,5 +47,5 @@ index 8ea5ca8d71d6..6d5871992f79 100644
.name = "hci_uart_bcm",
.of_match_table = of_match_ptr(bcm_bluetooth_of_match),
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
similarity index 93%
rename from
gnu/packages/patches/pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
index 8b72adc..6fe30b4 100644
---
a/gnu/packages/patches/pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-07-mmc-core-pwrseq_simple-disable-mmc-power-on-shutdown.patch
@@ -1,7 +1,7 @@
-From bd0386f85726b943149d6fa730fd8ec8bcd6f854 Mon Sep 17 00:00:00 2001
+From 5713dbccdad4c1eb4ebc17d7a45af644532a7ccc 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/26] mmc: core: pwrseq_simple: disable mmc power on shutdown
+Subject: [PATCH 07/25] mmc: core: pwrseq_simple: disable mmc power on shutdown
Fix for Broadcom SDIO WiFi modules. They misbehave if reinitialized
without a power cycle.
@@ -60,5 +60,5 @@ index ea4d3670560e..38fe7e29aba6 100644
.name = "pwrseq_simple",
.of_match_table = mmc_pwrseq_simple_of_match,
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
similarity index 75%
rename from
gnu/packages/patches/pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
index 9ed6d68..c7c959b 100644
---
a/gnu/packages/patches/pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-08-regulator-core-add-generic-suspend-states-support.patch
@@ -1,7 +1,7 @@
-From 7aec49cb387e9f5ad51e8e0d3b01376a416d4ff2 Mon Sep 17 00:00:00 2001
+From 76c1a1db722fc5927588e6f72402a21474a9dcbe 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/26] regulator: core: add generic suspend states support
+Subject: [PATCH 08/25] regulator: core: add generic suspend states support
This commit adds genric suspend support for regualtors without
explicit suspend ops.
@@ -10,15 +10,15 @@ procedure might be unsafe.
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
- drivers/regulator/core.c | 48 +++++++++++++++++++++++++++++---
- include/linux/regulator/driver.h | 3 ++
- 2 files changed, 47 insertions(+), 4 deletions(-)
+ drivers/regulator/core.c | 46 +++++++++++++++++++++++++++++---
+ include/linux/regulator/driver.h | 3 +++
+ 2 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index 03154f5b939f..2354ec5072a8 100644
+index 42bbd99a36ac..72fb6f417c36 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
-@@ -5286,6 +5286,14 @@ void regulator_unregister(struct regulator_dev *rdev)
+@@ -5411,6 +5411,14 @@ void regulator_unregister(struct regulator_dev *rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);
#ifdef CONFIG_SUSPEND
@@ -33,15 +33,10 @@ index 03154f5b939f..2354ec5072a8 100644
/**
* regulator_suspend - prepare regulators for system wide suspend
* @dev: ``&struct device`` pointer that is passed to _regulator_suspend()
-@@ -5296,10 +5304,33 @@ static int regulator_suspend(struct device *dev)
- {
- struct regulator_dev *rdev = dev_to_rdev(dev);
- suspend_state_t state = pm_suspend_target_state;
-+ struct regulator_state *rstate;
- int ret;
+@@ -5430,6 +5438,28 @@ static int regulator_suspend(struct device *dev)
regulator_lock(rdev);
- ret = suspend_set_state(rdev, state);
+ ret = __suspend_set_state(rdev, rstate);
+ if (ret) {
+ goto out;
+ }
@@ -67,13 +62,12 @@ index 03154f5b939f..2354ec5072a8 100644
regulator_unlock(rdev);
return ret;
-@@ -5318,10 +5349,19 @@ static int regulator_resume(struct device *dev)
+@@ -5452,9 +5482,19 @@ static int regulator_resume(struct device *dev)
regulator_lock(rdev);
-- if (rdev->desc->ops->resume &&
-- (rstate->enabled == ENABLE_IN_SUSPEND ||
-- rstate->enabled == DISABLE_IN_SUSPEND))
+- if (rstate->enabled == ENABLE_IN_SUSPEND ||
+- rstate->enabled == DISABLE_IN_SUSPEND)
- ret = rdev->desc->ops->resume(rdev);
+ if (rstate->enabled == ENABLE_IN_SUSPEND || rstate->enabled ==
DISABLE_IN_SUSPEND) {
+ if (rdev->desc->ops->resume) {
@@ -92,10 +86,10 @@ index 03154f5b939f..2354ec5072a8 100644
regulator_unlock(rdev);
diff --git a/include/linux/regulator/driver.h
b/include/linux/regulator/driver.h
-index 7eb9fea8e482..077a935b19c5 100644
+index 11cade73726c..8a67654b5911 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
-@@ -465,6 +465,9 @@ struct regulator_dev {
+@@ -470,6 +470,9 @@ struct regulator_dev {
/* time when this regulator was disabled last time */
unsigned long last_off_jiffy;
@@ -106,5 +100,5 @@ index 7eb9fea8e482..077a935b19c5 100644
struct regulator_dev *
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
similarity index 88%
rename from
gnu/packages/patches/pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
index 69da280..229e7a2 100644
---
a/gnu/packages/patches/pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-09-usb-typec-bus-Catch-crash-due-to-partner-NULL-value.patch
@@ -1,7 +1,7 @@
-From dd4206695a4135f6a3a3b228f33663bfa1987e27 Mon Sep 17 00:00:00 2001
+From 56ed7bf8b832acd44124979f271039edafc3926e 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/26] usb: typec: bus: Catch crash due to partner NULL value
+Subject: [PATCH 09/25] 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.
@@ -32,5 +32,5 @@ index e8ddb81cb6df..1d0265f46441 100644
pdev->ops->attention(pdev, vdo);
}
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
similarity index 82%
rename from
gnu/packages/patches/pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
index 403e40e..7623391 100644
---
a/gnu/packages/patches/pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-10-usb-typec-tcpm-add-hacky-generic-altmode-support.patch
@@ -1,7 +1,7 @@
-From 34dd01fcb581d221aacb960a9e3a3030429c6638 Mon Sep 17 00:00:00 2001
+From 4cc23f7ad56655303ca839d2956d7f5d7c5d0696 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/26] usb: typec: tcpm: add hacky generic altmode support
+Subject: [PATCH 10/25] 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
@@ -9,26 +9,25 @@ maintainers.
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
- drivers/usb/typec/tcpm/tcpm.c | 140 +++++++++++++++++++++++++++++++++-
- 1 file changed, 139 insertions(+), 1 deletion(-)
+ drivers/usb/typec/tcpm/tcpm.c | 139 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 138 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index 82b19ebd7838..9858df11590b 100644
+index a6fae1f86505..2908771f4d4e 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -8,6 +8,7 @@
- #include <linux/completion.h>
+@@ -9,6 +9,7 @@
#include <linux/debugfs.h>
#include <linux/device.h>
+ #include <linux/hrtimer.h>
+#include <linux/extcon-provider.h>
#include <linux/jiffies.h>
#include <linux/kernel.h>
- #include <linux/module.h>
-@@ -322,6 +323,12 @@ struct tcpm_port {
- /* port belongs to a self powered device */
- bool self_powered;
+ #include <linux/kthread.h>
+@@ -369,6 +370,11 @@ struct tcpm_port {
+ /* Sink caps have been queried */
+ bool sink_cap_done;
-+
+#ifdef CONFIG_EXTCON
+ struct extcon_dev *extcon;
+ unsigned int *extcon_cables;
@@ -37,7 +36,7 @@ index 82b19ebd7838..9858df11590b 100644
#ifdef CONFIG_DEBUG_FS
struct dentry *dentry;
struct mutex logbuffer_lock; /* log buffer access lock */
-@@ -607,6 +614,35 @@ static void tcpm_debugfs_exit(const struct tcpm_port
*port) { }
+@@ -654,6 +660,35 @@ static void tcpm_debugfs_exit(const struct tcpm_port
*port) { }
#endif
@@ -73,7 +72,7 @@ index 82b19ebd7838..9858df11590b 100644
static int tcpm_pd_transmit(struct tcpm_port *port,
enum tcpm_transmit_type type,
const struct pd_message *msg)
-@@ -834,6 +870,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool
attached,
+@@ -881,6 +916,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool
attached,
typec_set_data_role(port->typec_port, data);
typec_set_pwr_role(port->typec_port, role);
@@ -82,26 +81,26 @@ index 82b19ebd7838..9858df11590b 100644
return 0;
}
-@@ -1044,7 +1082,7 @@ static void svdm_consume_modes(struct tcpm_port *port,
const __le32 *payload,
+@@ -1132,7 +1169,7 @@ static void svdm_consume_modes(struct tcpm_port *port,
const u32 *p, int cnt)
paltmode->mode = i;
- paltmode->vdo = le32_to_cpu(payload[i]);
+ paltmode->vdo = p[i];
- tcpm_log(port, " Alternate mode %d: SVID 0x%04x, VDO %d:
0x%08x",
+ tcpm_log(port, "Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x",
pmdata->altmodes, paltmode->svid,
paltmode->mode, paltmode->vdo);
-@@ -1064,6 +1102,9 @@ static void tcpm_register_partner_altmodes(struct
tcpm_port *port)
- if (!altmode)
- tcpm_log(port, "Failed to register partner SVID 0x%04x",
+@@ -1154,6 +1191,9 @@ static void tcpm_register_partner_altmodes(struct
tcpm_port *port)
modep->altmode_desc[i].svid);
+ altmode = NULL;
+ }
+ else
+ tcpm_log(port, "Registered altmode 0x%04x",
modep->altmode_desc[i].svid);
+
port->partner_altmode[i] = altmode;
}
}
-@@ -1167,9 +1208,11 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const
__le32 *payload, int cnt,
+@@ -1249,9 +1289,11 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct
typec_altmode *adev,
modep->svid_index++;
if (modep->svid_index < modep->nsvids) {
u16 svid = modep->svids[modep->svid_index];
@@ -113,7 +112,7 @@ index 82b19ebd7838..9858df11590b 100644
tcpm_register_partner_altmodes(port);
}
break;
-@@ -2693,6 +2736,7 @@ static int tcpm_src_attach(struct tcpm_port *port)
+@@ -2836,6 +2878,7 @@ static int tcpm_src_attach(struct tcpm_port *port)
static void tcpm_typec_disconnect(struct tcpm_port *port)
{
if (port->connected) {
@@ -121,8 +120,8 @@ index 82b19ebd7838..9858df11590b 100644
typec_unregister_partner(port->partner);
port->partner = NULL;
port->connected = false;
-@@ -2750,6 +2794,8 @@ static void tcpm_detach(struct tcpm_port *port)
- port->hard_reset_count = 0;
+@@ -2902,6 +2945,8 @@ static void tcpm_detach(struct tcpm_port *port)
+ }
tcpm_reset_port(port);
+
@@ -130,7 +129,7 @@ index 82b19ebd7838..9858df11590b 100644
}
static void tcpm_src_detach(struct tcpm_port *port)
-@@ -4424,6 +4470,64 @@ void tcpm_tcpc_reset(struct tcpm_port *port)
+@@ -4732,6 +4777,64 @@ void tcpm_tcpc_reset(struct tcpm_port *port)
}
EXPORT_SYMBOL_GPL(tcpm_tcpc_reset);
@@ -195,7 +194,7 @@ index 82b19ebd7838..9858df11590b 100644
static int tcpm_fw_get_caps(struct tcpm_port *port,
struct fwnode_handle *fwnode)
{
-@@ -4434,6 +4538,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
+@@ -4742,6 +4845,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
if (!fwnode)
return -EINVAL;
@@ -219,7 +218,7 @@ index 82b19ebd7838..9858df11590b 100644
/* USB data support is optional */
ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
if (ret == 0) {
-@@ -4766,6 +4887,17 @@ struct tcpm_port *tcpm_register_port(struct device
*dev, struct tcpc_dev *tcpc)
+@@ -5114,6 +5234,17 @@ struct tcpm_port *tcpm_register_port(struct device
*dev, struct tcpc_dev *tcpc)
goto out_destroy_wq;
port->try_role = port->typec_caps.prefer_role;
@@ -237,7 +236,7 @@ index 82b19ebd7838..9858df11590b 100644
port->typec_caps.fwnode = tcpc->fwnode;
port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */
-@@ -4793,6 +4925,12 @@ struct tcpm_port *tcpm_register_port(struct device
*dev, struct tcpc_dev *tcpc)
+@@ -5141,6 +5272,12 @@ struct tcpm_port *tcpm_register_port(struct device
*dev, struct tcpc_dev *tcpc)
goto out_role_sw_put;
}
@@ -251,5 +250,5 @@ index 82b19ebd7838..9858df11590b 100644
tcpm_init(port);
mutex_unlock(&port->lock);
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
similarity index 90%
rename from
gnu/packages/patches/pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
index 3a07093..a465c3a 100644
---
a/gnu/packages/patches/pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-11-phy-rockchip-typec-Set-extcon-capabilities.patch
@@ -1,7 +1,7 @@
-From 32dbd649f3251732cccf5b0bac2e0e2334a6e3bf Mon Sep 17 00:00:00 2001
+From 25cc182e2d2e266dc5aea0abde45220d590329bb 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/26] phy: rockchip: typec: Set extcon capabilities
+Subject: [PATCH 11/25] phy: rockchip: typec: Set extcon capabilities
Do not mainline, hack.
@@ -11,7 +11,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 17 insertions(+)
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c
b/drivers/phy/rockchip/phy-rockchip-typec.c
-index 24563160197f..f5b497b4b97e 100644
+index 70a31251b202..5385bb4f0bd4 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -40,6 +40,7 @@
@@ -46,5 +46,5 @@ index 24563160197f..f5b497b4b97e 100644
pm_runtime_enable(dev);
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
similarity index 87%
rename from
gnu/packages/patches/pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
index 4208ceb..570ed9d 100644
---
a/gnu/packages/patches/pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-12-usb-typec-altmodes-displayport-Add-hacky-generic-alt.patch
@@ -1,7 +1,7 @@
-From ea5ed45f85ea1184106aa55d2eafa94a8ede38bf Mon Sep 17 00:00:00 2001
+From d2690c535f7766bce79a5dee06051c96698f90b3 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/26] usb: typec: altmodes: displayport: Add hacky, generic
+Subject: [PATCH 12/25] usb: typec: altmodes: displayport: Add hacky, generic
altmode detection
Do not mainline, hack.
@@ -12,7 +12,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 52 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/typec/altmodes/displayport.c
b/drivers/usb/typec/altmodes/displayport.c
-index 0edfb89e04a8..c87cd57302cd 100644
+index e62e5e3da01e..a3d03db476aa 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -9,6 +9,8 @@
@@ -24,7 +24,7 @@ index 0edfb89e04a8..c87cd57302cd 100644
#include <linux/mutex.h>
#include <linux/module.h>
#include <linux/usb/pd_vdo.h>
-@@ -134,15 +136,53 @@ static int dp_altmode_status_update(struct dp_altmode
*dp)
+@@ -135,15 +137,53 @@ static int dp_altmode_status_update(struct dp_altmode
*dp)
return ret;
}
@@ -79,7 +79,7 @@ index 0edfb89e04a8..c87cd57302cd 100644
ret = dp_altmode_notify(dp);
if (ret)
-@@ -169,9 +209,11 @@ static int dp_altmode_configure_vdm(struct dp_altmode
*dp, u32 conf)
+@@ -170,9 +210,11 @@ static int dp_altmode_configure_vdm(struct dp_altmode
*dp, u32 conf)
if (ret) {
if (DP_CONF_GET_PIN_ASSIGN(dp->data.conf))
dp_altmode_notify(dp);
@@ -92,7 +92,7 @@ index 0edfb89e04a8..c87cd57302cd 100644
}
return ret;
-@@ -210,6 +252,8 @@ static void dp_altmode_work(struct work_struct *work)
+@@ -211,6 +253,8 @@ static void dp_altmode_work(struct work_struct *work)
case DP_STATE_EXIT:
if (typec_altmode_exit(dp->alt))
dev_err(&dp->alt->dev, "Exit Mode Failed!\n");
@@ -101,7 +101,7 @@ index 0edfb89e04a8..c87cd57302cd 100644
break;
default:
break;
-@@ -520,8 +564,13 @@ int dp_altmode_probe(struct typec_altmode *alt)
+@@ -521,8 +565,13 @@ int dp_altmode_probe(struct typec_altmode *alt)
if (!(DP_CAP_DFP_D_PIN_ASSIGN(port->vdo) &
DP_CAP_UFP_D_PIN_ASSIGN(alt->vdo)) &&
!(DP_CAP_UFP_D_PIN_ASSIGN(port->vdo) &
@@ -117,5 +117,5 @@ index 0edfb89e04a8..c87cd57302cd 100644
ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);
if (ret)
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
similarity index 78%
rename from
gnu/packages/patches/pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
index df89026..2f1c5cb 100644
---
a/gnu/packages/patches/pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-13-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
@@ -1,7 +1,7 @@
-From ef76d3135780573232aa2d6c60858eec118c8a7a Mon Sep 17 00:00:00 2001
+From c857311f9d88375f1e8776be6b48e41f3d5cef8d 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/26] sound: soc: codecs: es8316: Run micdetect only if jack
+Subject: [PATCH 13/25] sound: soc: codecs: es8316: Run micdetect only if jack
status asserted
Think this is (was?) required to prevent flapping of detection status on
@@ -13,10 +13,10 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
-index 36eef1fb3d18..b303ebbd5f53 100644
+index bd5d230c5df2..a2d8bf620b6f 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
-@@ -687,7 +687,7 @@ static void es8316_disable_jack_detect(struct
snd_soc_component *component)
+@@ -688,7 +688,7 @@ static void es8316_disable_jack_detect(struct
snd_soc_component *component)
snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
ES8316_GPIO_ENABLE_INTERRUPT, 0);
@@ -26,5 +26,5 @@ index 36eef1fb3d18..b303ebbd5f53 100644
snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0);
}
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
similarity index 89%
rename from
gnu/packages/patches/pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
index 2da99ac..865a585 100644
---
a/gnu/packages/patches/pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-14-ASoC-soc-jack.c-supported-inverted-jack-detect-GPIOs.patch
@@ -1,7 +1,7 @@
-From 8ce60b3793e5817da651ec57714e9fabde51b8cc Mon Sep 17 00:00:00 2001
+From a23ca7bcab36e325895be5a65cb6f24dc092a233 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/26] ASoC: soc-jack.c: supported inverted jack detect GPIOs
+Subject: [PATCH 14/25] ASoC: soc-jack.c: supported inverted jack detect GPIOs
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
@@ -41,5 +41,5 @@ index 0f1820f36b4d..8d9d77814f33 100644
if (ret)
goto undo;
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
similarity index 84%
rename from
gnu/packages/patches/pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
index c45e7d6..b8238c4 100644
---
a/gnu/packages/patches/pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-15-arm64-dts-rockchip-add-default-rk3399-rockchip-suspe.patch
@@ -1,7 +1,7 @@
-From dcb8c9e5ede133d3e90f6d2486f68fbbc890b8ba Mon Sep 17 00:00:00 2001
+From c6e32234b528d57bfd068e13dbdd184a420dffe2 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/26] arm64: dts: rockchip: add default rk3399
+Subject: [PATCH 15/25] arm64: dts: rockchip: add default rk3399
rockchip-suspend node
Again this has no place in mainline. Should be handled by ATF
@@ -13,7 +13,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index 2581e9cc7a1d..4290bd1e69fb 100644
+index 7a9a7aca86c6..f83f9402f307 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -9,6 +9,7 @@
@@ -24,7 +24,7 @@ index 2581e9cc7a1d..4290bd1e69fb 100644
#include <dt-bindings/thermal/thermal.h>
/ {
-@@ -2664,4 +2665,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm {
+@@ -2680,4 +2681,27 @@ pcie_clkreqnb_cpm: pci-clkreqnb-cpm {
};
};
@@ -53,5 +53,5 @@ index 2581e9cc7a1d..4290bd1e69fb 100644
+ };
};
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
similarity index 79%
rename from
gnu/packages/patches/pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
index 7e25b71..4e12a54 100644
---
a/gnu/packages/patches/pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-16-arm64-dts-rockchip-enable-earlycon.patch
@@ -1,7 +1,7 @@
-From 91a2a2e359b97e8059e16df4e814cd76a5effb44 Mon Sep 17 00:00:00 2001
+From 3b788af95d6d865b47e7cbbcfff8dd088417ebe8 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/26] arm64: dts: rockchip: enable earlycon
+Subject: [PATCH 16/25] arm64: dts: rockchip: enable earlycon
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
@@ -9,7 +9,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index cb0245d2226d..95aee364b170 100644
+index 06d48338c836..c1aad8f88b8a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -19,6 +19,7 @@ / {
@@ -21,5 +21,5 @@ index cb0245d2226d..95aee364b170 100644
};
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
similarity index 83%
rename from
gnu/packages/patches/pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
index 2b317ee..71cad9f 100644
---
a/gnu/packages/patches/pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-17-arm64-dts-rockchip-reserve-memory-for-ATF-rockchip-S.patch
@@ -1,7 +1,7 @@
-From 50f71a8bbc64a1e7d935b1927211500d526afab3 Mon Sep 17 00:00:00 2001
+From a3d0420f6b403f4831c7158903d74651d92c426b 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/26] arm64: dts: rockchip: reserve memory for ATF rockchip
+Subject: [PATCH 17/25] arm64: dts: rockchip: reserve memory for ATF rockchip
SIP
Definitely not for mainline
@@ -12,7 +12,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index 95aee364b170..fdc11f7b87dd 100644
+index c1aad8f88b8a..7595633d9a7f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -23,6 +23,11 @@ chosen {
@@ -27,7 +27,7 @@ index 95aee364b170..fdc11f7b87dd 100644
backlight: edp-backlight {
compatible = "pwm-backlight";
power-supply = <&vcc_12v>;
-@@ -126,6 +131,12 @@ sdio_pwrseq: sdio-pwrseq {
+@@ -133,6 +138,12 @@ sdio_pwrseq: sdio-pwrseq {
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
};
@@ -41,5 +41,5 @@ index 95aee364b170..fdc11f7b87dd 100644
es8316-sound {
compatible = "simple-audio-card";
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-19-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
similarity index 82%
rename from
gnu/packages/patches/pinebook-pro-19-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
index f9027f0..5584e21 100644
---
a/gnu/packages/patches/pinebook-pro-19-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-18-arm64-dts-rockchip-use-power-led-for-disk-activity-i.patch
@@ -1,7 +1,7 @@
-From a0a431a31237cfd281a16ca0dd1ca31853fb1752 Mon Sep 17 00:00:00 2001
+From 1ee1be64645deae2dd53a01d73898f0bf755e78c 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 19/26] arm64: dts: rockchip: use power led for disk-activity
+Subject: [PATCH 18/25] arm64: dts: rockchip: use power led for disk-activity
indication
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
@@ -10,7 +10,7 @@ Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
1 file changed, 2 insertions(+), 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 aed6426273c0..73af605d6175 100644
+index 7595633d9a7f..667eeeb019de 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -110,7 +110,8 @@ green_led: led-0 {
@@ -24,5 +24,5 @@ index aed6426273c0..73af605d6175 100644
red_led: led-1 {
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-21-arm64-dts-rockchip-add-typec-extcon-hack.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch
similarity index 84%
rename from
gnu/packages/patches/pinebook-pro-21-arm64-dts-rockchip-add-typec-extcon-hack.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch
index b3febae..24d9a1b 100644
---
a/gnu/packages/patches/pinebook-pro-21-arm64-dts-rockchip-add-typec-extcon-hack.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-20-arm64-dts-rockchip-add-typec-extcon-hack.patch
@@ -1,7 +1,7 @@
-From ffae4f74bf4fe83cb43ca20c9585523851ddff50 Mon Sep 17 00:00:00 2001
+From 9be0d46fe0bbcb16a413c3e5c310444c5c8223ac 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 21/26] arm64: dts: rockchip: add typec extcon hack
+Subject: [PATCH 20/25] arm64: dts: rockchip: add typec extcon hack
Not for mainline
@@ -11,7 +11,7 @@ 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 f218c2a36434..950f3a7bb27a 100644
+index decb212e2dca..37f967a89401 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 {
@@ -41,5 +41,5 @@ index f218c2a36434..950f3a7bb27a 100644
};
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-22-arm64-dts-rockchip-add-rockchip-suspend-node.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch
similarity index 85%
rename from
gnu/packages/patches/pinebook-pro-22-arm64-dts-rockchip-add-rockchip-suspend-node.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch
index 6bd36ce..ae4f87c 100644
---
a/gnu/packages/patches/pinebook-pro-22-arm64-dts-rockchip-add-rockchip-suspend-node.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-21-arm64-dts-rockchip-add-rockchip-suspend-node.patch
@@ -1,7 +1,7 @@
-From 10b301fd7ca16ea327fdc30dafdd0e39d9f0e745 Mon Sep 17 00:00:00 2001
+From 023580a728ab485abf5d638f0c928b106804f8ac 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 22/26] arm64: dts: rockchip: add rockchip-suspend node
+Subject: [PATCH 21/25] arm64: dts: rockchip: add rockchip-suspend node
No mainline
@@ -11,7 +11,7 @@ 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 950f3a7bb27a..ef9c8daa74a7 100644
+index 37f967a89401..c505c88b5d9b 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 {
@@ -45,5 +45,5 @@ index 950f3a7bb27a..ef9c8daa74a7 100644
vref-supply = <&vcca1v8_s3>;
status = "okay";
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-23-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
similarity index 99%
rename from
gnu/packages/patches/pinebook-pro-23-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
index e866317..93dc8cd 100644
---
a/gnu/packages/patches/pinebook-pro-23-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-22-arm64-configs-add-defconfig-for-Pinebook-Pro.patch
@@ -1,7 +1,7 @@
-From 936a9a224504a2497cec4fa331a1953fe6e4dfee Mon Sep 17 00:00:00 2001
+From 9533f83b4cd0e3372aa574d9c903efea37a07a05 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 23/26] arm64: configs: add defconfig for Pinebook Pro
+Subject: [PATCH 22/25] arm64: configs: add defconfig for Pinebook Pro
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
@@ -3016,5 +3016,5 @@ index 000000000000..bc7bcee200e4
+# CONFIG_FTRACE is not set
+# CONFIG_RUNTIME_TESTING_MENU is not set
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-24-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
similarity index 84%
rename from
gnu/packages/patches/pinebook-pro-24-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
index 5e925bd..941ba59 100644
---
a/gnu/packages/patches/pinebook-pro-24-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-23-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-dat.patch
@@ -1,7 +1,7 @@
-From d12d494c5ef4faaaf1ecd92d74692c9a01ce9801 Mon Sep 17 00:00:00 2001
+From 6a33e51351f2ac8135c99f2640aefaf000116d3c 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 24/26] arm64: dts: rockchip: setup USB type c port as dual
+Subject: [PATCH 23/25] 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,7 +14,7 @@ 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 ef9c8daa74a7..3b2ef918d386 100644
+index c505c88b5d9b..d77dca5524ff 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 {
@@ -27,5 +27,5 @@ index ef9c8daa74a7..3b2ef918d386 100644
op-sink-microwatt = <1000000>;
power-role = "dual";
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-25-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
similarity index 97%
rename from
gnu/packages/patches/pinebook-pro-25-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-24-arm64-configs-Update-Pinbook-Pro-defconfig-to-v5.8-r.patch
index e44d722..00dc4da 100644
---
a/gnu/packages/patches/pinebook-pro-25-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
@@ -1,7 +1,7 @@
-From f644f660a561538b622d26b2afc5374f4a240cee Mon Sep 17 00:00:00 2001
+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 25/26] arm64: configs: Update Pinbook Pro defconfig to
+Subject: [PATCH 24/25] arm64: configs: Update Pinbook Pro defconfig to
v5.8-rc1
---
@@ -160,5 +160,5 @@ index bc7bcee200e4..2977cea49142 100644
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_OFB=m
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-26-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
b/gnu/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
similarity index 84%
rename from
gnu/packages/patches/pinebook-pro-26-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
rename to
gnu/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
index 326af2c..601301d 100644
---
a/gnu/packages/patches/pinebook-pro-26-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
+++
b/gnu/packages/patches/linux-libre-pinebook-pro-25-soc-rockchip-Port-rockchip_pm_config-driver-to-Linux.patch
@@ -1,7 +1,7 @@
-From 57cc0e9636c160cbae5845cedf0d463e87a6023c Mon Sep 17 00:00:00 2001
+From e635f9ae42726f2db386558c7f0b1470fec3e734 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 26/26] soc: rockchip: Port rockchip_pm_config driver to Linux
+Subject: [PATCH 25/25] soc: rockchip: Port rockchip_pm_config driver to Linux
5.8
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
@@ -23,5 +23,5 @@ index 43b2e0f33343..07a0ff9465d3 100644
pr_err("Disable nonboot cpus failed!\n");
return;
--
-2.28.0
+2.30.0
diff --git
a/gnu/packages/patches/pinebook-pro-18-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch
b/gnu/packages/patches/pinebook-pro-18-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch
deleted file mode 100644
index a9fa9a1..0000000
---
a/gnu/packages/patches/pinebook-pro-18-arm64-dts-rockchip-add-cw2015-fuel-gauge.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 711281737deced0f90a859a8cbb77e8757015962 Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Thu, 28 May 2020 14:41:41 +0200
-Subject: [PATCH 18/26] arm64: dts: rockchip: add cw2015 fuel gauge
-
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
----
- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 25 +++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index fdc11f7b87dd..aed6426273c0 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -34,6 +34,13 @@ backlight: edp-backlight {
- pwms = <&pwm0 0 740740 0>;
- };
-
-+ bat: battery {
-+ compatible = "simple-battery";
-+ charge-full-design-microamp-hours = <9800000>;
-+ voltage-max-design-microvolt = <4350000>;
-+ voltage-min-design-microvolt = <3000000>;
-+ };
-+
- edp_panel: edp-panel {
- compatible = "boe,nv140fhmn49";
- backlight = <&backlight>;
-@@ -753,6 +760,24 @@ usbc_dp: endpoint {
- };
- };
- };
-+
-+ cw2015@62 {
-+ compatible = "cellwise,cw2015";
-+ reg = <0x62>;
-+ cellwise,battery-profile = /bits/ 8 <
-+ 0x17 0x67 0x80 0x73 0x6E 0x6C 0x6B 0x63
-+ 0x77 0x51 0x5C 0x58 0x50 0x4C 0x48 0x36
-+ 0x15 0x0C 0x0C 0x19 0x5B 0x7D 0x6F 0x69
-+ 0x69 0x5B 0x0C 0x29 0x20 0x40 0x52 0x59
-+ 0x57 0x56 0x54 0x4F 0x3B 0x1F 0x7F 0x17
-+ 0x06 0x1A 0x30 0x5A 0x85 0x93 0x96 0x2D
-+ 0x48 0x77 0x9C 0xB3 0x80 0x52 0x94 0xCB
-+ 0x2F 0x00 0x64 0xA5 0xB5 0x11 0xF0 0x11
-+ >;
-+ cellwise,monitor-interval-ms = <5000>;
-+ monitored-battery = <&bat>;
-+ power-supplies = <&mains_charger>, <&fusb0>;
-+ };
- };
-
- &i2s1 {
---
-2.28.0
-
diff --git
a/gnu/packages/patches/pinebook-pro-20-arm64-dts-rockchip-add-oficially-unsupported-2GHz-op.patch
b/gnu/packages/patches/pinebook-pro-20-arm64-dts-rockchip-add-oficially-unsupported-2GHz-op.patch
deleted file mode 100644
index 0cc4a8a..0000000
---
a/gnu/packages/patches/pinebook-pro-20-arm64-dts-rockchip-add-oficially-unsupported-2GHz-op.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8157899a63c0b4fb6ae334d0787508c42263b20b Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Thu, 28 May 2020 14:43:27 +0200
-Subject: [PATCH 20/26] arm64: dts: rockchip: add oficially unsupported 2GHz
- opp
-
-No mainlining here.
-
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
----
- arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index 73af605d6175..f218c2a36434 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -392,6 +392,13 @@ mains_charger: dc-charger {
- };
- };
-
-+&cluster1_opp {
-+ opp08 {
-+ opp-hz = /bits/ 64 <2000000000>;
-+ opp-microvolt = <1300000>;
-+ };
-+};
-+
- &cdn_dp {
- status = "okay";
- };
---
-2.28.0
-