aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-05 13:43:41 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-06 19:55:19 +0200
commit2c2fcbd2e0f856f460040b8c67530ca27fa323e7 (patch)
tree1bb399fe95e81ae6961dfa6ccfc88bf99fd7561b /target/linux/mvebu
parentad22f6a8aae42131cadb06091c11f27571a2ce92 (diff)
downloadupstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.tar.gz
upstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.tar.bz2
upstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.zip
kernel: bump 5.4 to 5.4.63
Manually merged: hack-5.4 230-openwrt_lzma_options.patch bcm27xx 950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch x86 011-tune_lzma_options.patch Remove upstreamed patches in collaboration with Ansuel Smith: ipq806x 093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch 093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch 093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch All other modifications made by update_kernel.sh Build-tested: bcm27xx/bcm2708, ipq806x, x86/64 Run-tested: ipq806x (R7800), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [update commit message/tested] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch b/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch
index e4dee5c09e..7b7e8cd034 100644
--- a/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch
+++ b/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch
@@ -1,6 +1,6 @@
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
-@@ -99,6 +99,17 @@
+@@ -99,6 +99,17 @@ config POWER_RESET_HISI
help
Reboot support for Hisilicon boards.
@@ -20,7 +20,7 @@
depends on ARCH_QCOM
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,7 @@ obj-$(CONFIG_POWER_RESET_GEMINI_POWEROFF
obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o
obj-$(CONFIG_POWER_RESET_GPIO_RESTART) += gpio-restart.o
obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
@@ -28,7 +28,7 @@
obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
obj-$(CONFIG_POWER_RESET_QCOM_PON) += qcom-pon.o
obj-$(CONFIG_POWER_RESET_OCELOT_RESET) += ocelot-reset.o
---- a/dev/null
+--- /dev/null
+++ b/drivers/power/reset/linkstation-poweroff.c
@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: GPL-2.0