aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-22 07:12:09 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-07 22:28:59 +0200
commit3ce3de934c34b8d36012cb687b38e5bcff62f95d (patch)
tree7ae917d077373f86217a662c03f6ebe3ea2e2c24 /target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
parentb24c30170940362eead8c57fedbb57f360d40f1e (diff)
downloadupstream-3ce3de934c34b8d36012cb687b38e5bcff62f95d.tar.gz
upstream-3ce3de934c34b8d36012cb687b38e5bcff62f95d.tar.bz2
upstream-3ce3de934c34b8d36012cb687b38e5bcff62f95d.zip
kernel: bump 5.10 to 5.10.117
Removed upstreamed: backport-5.10/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 01a6a5c73120ccddd2a83381252ede91aac070f4)
Diffstat (limited to 'target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch')
-rw-r--r--target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch b/target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
index b9ec7af1ae..6d76640ead 100644
--- a/target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
+++ b/target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)
{
intrl2_0_mask_set(priv, 0xffffffff);
-@@ -872,6 +910,8 @@ static int bcm_sf2_sw_resume(struct dsa_
+@@ -875,6 +913,8 @@ static int bcm_sf2_sw_resume(struct dsa_
return ret;
}
@@ -91,7 +91,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ret = bcm_sf2_cfp_resume(ds);
if (ret)
return ret;
-@@ -1143,6 +1183,7 @@ struct bcm_sf2_of_data {
+@@ -1146,6 +1186,7 @@ struct bcm_sf2_of_data {
const u16 *reg_offsets;
unsigned int core_reg_align;
unsigned int num_cfp_rules;
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
static const u16 bcm_sf2_4908_reg_offsets[] = {
-@@ -1167,6 +1208,7 @@ static const struct bcm_sf2_of_data bcm_
+@@ -1170,6 +1211,7 @@ static const struct bcm_sf2_of_data bcm_
.core_reg_align = 0,
.reg_offsets = bcm_sf2_4908_reg_offsets,
.num_cfp_rules = 0, /* FIXME */
@@ -107,7 +107,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
/* Register offsets for the SWITCH_REG_* block */
-@@ -1277,6 +1319,7 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1280,6 +1322,7 @@ static int bcm_sf2_sw_probe(struct platf
priv->reg_offsets = data->reg_offsets;
priv->core_reg_align = data->core_reg_align;
priv->num_cfp_rules = data->num_cfp_rules;
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
priv->rcdev = devm_reset_control_get_optional_exclusive(&pdev->dev,
"switch");
-@@ -1350,6 +1393,8 @@ static int bcm_sf2_sw_probe(struct platf
+@@ -1353,6 +1396,8 @@ static int bcm_sf2_sw_probe(struct platf
goto out_clk_mdiv;
}