diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2022-12-07 09:57:47 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2022-12-07 10:30:14 +0100 |
| commit | 50d255d4a8e8a89ce4b593b3c6b5c4484798553b (patch) | |
| tree | 2a408acd738a06a76e205526950eba69a6362080 /target/linux/bcm4908 | |
| parent | 88a71fbe774b048457bfca3721098f6da0b167d8 (diff) | |
| download | upstream-50d255d4a8e8a89ce4b593b3c6b5c4484798553b.tar.gz upstream-50d255d4a8e8a89ce4b593b3c6b5c4484798553b.tar.bz2 upstream-50d255d4a8e8a89ce4b593b3c6b5c4484798553b.zip | |
kernel: backport b53/bcm_sf2 changes from v5.8
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm4908')
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch b/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch index 776cf4a1f2..83a9b9345f 100644 --- a/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch +++ b/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <linux/delay.h> #include <linux/export.h> #include <linux/gpio.h> -@@ -2596,8 +2594,9 @@ int b53_switch_detect(struct b53_device +@@ -2616,8 +2614,9 @@ int b53_switch_detect(struct b53_device dev->chip_id = id32; break; default: @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return -ENODEV; } } -@@ -2627,7 +2626,8 @@ int b53_switch_register(struct b53_devic +@@ -2647,7 +2646,8 @@ int b53_switch_register(struct b53_devic if (ret) return ret; diff --git a/target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch b/target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch index 531388da70..5c698a342f 100644 --- a/target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch +++ b/target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch @@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c -@@ -2392,6 +2392,22 @@ static const struct b53_chip_data b53_sw +@@ -2409,6 +2409,22 @@ static const struct b53_chip_data b53_sw .jumbo_pm_reg = B53_JUMBO_PORT_MASK, .jumbo_size_reg = B53_JUMBO_MAX_SIZE, }, |