aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-07 12:36:29 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-08 16:34:18 +0100
commitf3b827a965a5e2b0c217fd131f3a8d1ba1740aa3 (patch)
tree3fd17d888d602be8b299f25b3d0e073dbe3eb9b1 /target/linux/bcm4908/patches-5.4
parentdb00f312d3ae700adbecc4d1b5d7476cc8ef7f92 (diff)
downloadupstream-f3b827a965a5e2b0c217fd131f3a8d1ba1740aa3.tar.gz
upstream-f3b827a965a5e2b0c217fd131f3a8d1ba1740aa3.tar.bz2
upstream-f3b827a965a5e2b0c217fd131f3a8d1ba1740aa3.zip
kernel: bump 5.4 to 5.4.96
Ran update_kernel.sh in a fresh clone without any existing toolchains. Build system: x86_64 Build-tested: ipq806x/R7800, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 Run-tested [*]: ramips/mt7621 (R6800, DIR-878 A1, EAP235-Wall) Signed-off-by: John Audia <graysky@archlinux.us> Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
Diffstat (limited to 'target/linux/bcm4908/patches-5.4')
-rw-r--r--target/linux/bcm4908/patches-5.4/071-v5.12-0029-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm4908/patches-5.4/071-v5.12-0029-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch b/target/linux/bcm4908/patches-5.4/071-v5.12-0029-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch
index dcf1e62f77..549af546fe 100644
--- a/target/linux/bcm4908/patches-5.4/071-v5.12-0029-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch
+++ b/target/linux/bcm4908/patches-5.4/071-v5.12-0029-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch
@@ -68,7 +68,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
offset = CORE_STS_OVERRIDE_IMP;
else
offset = CORE_STS_OVERRIDE_IMP2;
-@@ -542,7 +543,8 @@ static void bcm_sf2_sw_mac_config(struct
+@@ -546,7 +547,8 @@ static void bcm_sf2_sw_mac_config(struct
if (port == core_readl(priv, CORE_IMP0_PRT_ID))
return;
@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
else
offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
-@@ -984,6 +986,30 @@ struct bcm_sf2_of_data {
+@@ -988,6 +990,30 @@ struct bcm_sf2_of_data {
unsigned int num_cfp_rules;
};
@@ -109,7 +109,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* Register offsets for the SWITCH_REG_* block */
static const u16 bcm_sf2_7445_reg_offsets[] = {
[REG_SWITCH_CNTRL] = 0x00,
-@@ -1032,6 +1058,9 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1036,6 +1062,9 @@ static const struct bcm_sf2_of_data bcm_
};
static const struct of_device_id bcm_sf2_of_match[] = {