mirror of
https://github.com/armbian/build.git
synced 2025-09-19 12:41:39 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Fri, 9 Dec 2022 21:48:59 +0100
|
|
Subject: misc: ppkb-manager: Remove BLOCKED flag
|
|
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
---
|
|
drivers/misc/ppkb-manager.c | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/drivers/misc/ppkb-manager.c b/drivers/misc/ppkb-manager.c
|
|
index 528b3472675e..98e2e39c39be 100644
|
|
--- a/drivers/misc/ppkb-manager.c
|
|
+++ b/drivers/misc/ppkb-manager.c
|
|
@@ -31,7 +31,6 @@
|
|
enum {
|
|
KBPWR_F_DISABLED,
|
|
KBPWR_F_EMERGENCY_SHUTDOWN,
|
|
- KBPWR_F_BLOCKED,
|
|
};
|
|
|
|
enum {
|
|
@@ -338,7 +337,6 @@ static int kbpwr_handle_critical(struct kbpwr_dev *kbpwr)
|
|
"critically low capacity reached\n");
|
|
|
|
//hw_protection_shutdown("Critical capacity", 30000);
|
|
- //set_bit(KBPWR_F_BLOCKED, kbpwr->flags);
|
|
return true;
|
|
}
|
|
|
|
@@ -354,8 +352,6 @@ static void kbpwr_work(struct work_struct *work)
|
|
|
|
if (test_bit(KBPWR_F_DISABLED, kbpwr->flags))
|
|
return;
|
|
- if (test_bit(KBPWR_F_BLOCKED, kbpwr->flags))
|
|
- return;
|
|
|
|
mutex_lock(&kbpwr->lock);
|
|
|
|
@@ -761,8 +757,6 @@ static int kbpwr_status_show(struct seq_file *s, void *data)
|
|
|
|
seq_printf(s, "\t\"disabled\": %s,\n",
|
|
test_bit(KBPWR_F_DISABLED, kbpwr->flags) ? "true" : "false");
|
|
- seq_printf(s, "\t\"blocked\": %s,\n",
|
|
- test_bit(KBPWR_F_BLOCKED, kbpwr->flags) ? "true" : "false");
|
|
seq_printf(s, "\t\"emergency_shutdown_enable\": %s,\n",
|
|
test_bit(KBPWR_F_EMERGENCY_SHUTDOWN, kbpwr->flags) ? "true" : "false");
|
|
|
|
@@ -854,8 +848,6 @@ static int kbpwr_probe(struct platform_device *pdev)
|
|
dev_info(dev, "Pinephone keyboard power manager ready\n");
|
|
|
|
set_bit(KBPWR_F_EMERGENCY_SHUTDOWN, kbpwr->flags);
|
|
- if (of_property_read_bool(np, "blocked"))
|
|
- set_bit(KBPWR_F_BLOCKED, kbpwr->flags);
|
|
|
|
queue_delayed_work(kbpwr->wq, &kbpwr->work, msecs_to_jiffies(10000));
|
|
|
|
--
|
|
Armbian
|
|
|