aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-01-05 13:27:56 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-07 22:30:40 +0100
commit536f051b971c8b3aada21c35ca7deefb94e7dd74 (patch)
treead9ea9602c3aa4f733eb732cf0655f6f616edad9 /target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch
parent9f08557649a733b236bb7fd111f6113549a18558 (diff)
downloadupstream-536f051b971c8b3aada21c35ca7deefb94e7dd74.tar.gz
upstream-536f051b971c8b3aada21c35ca7deefb94e7dd74.tar.bz2
upstream-536f051b971c8b3aada21c35ca7deefb94e7dd74.zip
kernel: bump 5.10 to 5.10.90
Add and enable a new kconfig knob to disable unprivileged eBPF by default. Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch')
-rw-r--r--target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch b/target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch
index 0b3b4ad2d7..a929aacfd0 100644
--- a/target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch
+++ b/target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch
@@ -17,8 +17,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
drivers/power/reset/linkstation-poweroff.c | 43 ++++++++++++++++++++++
1 file changed, 43 insertions(+)
-diff --git a/drivers/power/reset/linkstation-poweroff.c b/drivers/power/reset/linkstation-poweroff.c
-index 8691cf98600d..2a92b6052cac 100644
--- a/drivers/power/reset/linkstation-poweroff.c
+++ b/drivers/power/reset/linkstation-poweroff.c
@@ -19,6 +19,7 @@
@@ -38,7 +36,7 @@ index 8691cf98600d..2a92b6052cac 100644
struct power_off_cfg {
char *mdio_node_name;
void (*phy_set_reg)(bool restart);
-@@ -76,11 +79,48 @@ static void linkstation_mvphy_reg_intn(bool restart)
+@@ -76,11 +79,48 @@ err:
dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
}
@@ -87,7 +85,7 @@ index 8691cf98600d..2a92b6052cac 100644
static int linkstation_reboot_notifier(struct notifier_block *nb,
unsigned long action, void *unused)
{
-@@ -109,6 +149,9 @@ static const struct of_device_id ls_poweroff_of_match[] = {
+@@ -109,6 +149,9 @@ static const struct of_device_id ls_powe
{ .compatible = "buffalo,ls421de",
.data = &linkstation_power_off_cfg,
},
@@ -97,6 +95,3 @@ index 8691cf98600d..2a92b6052cac 100644
{ },
};
---
-2.25.1
-