From 2c2fcbd2e0f856f460040b8c67530ca27fa323e7 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 5 Sep 2020 13:43:41 -0400 Subject: 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 [update commit message/tested] Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/mvebu') 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 -- cgit v1.2.3