diff options
| author | John Audia <graysky@archlinux.us> | 2022-02-16 09:46:00 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-01 21:38:36 +0100 |
| commit | a2d4b5711aa73d14ffbc4f90a7944473b80baecb (patch) | |
| tree | a5a8e558eaa6ea6a93cfec89362b6ed9cb5b1dd1 /target/linux/bcm4908/patches-5.10/075-v5.13-0002-net-dsa-bcm_sf2-setup-BCM4908-internal-crossbar.patch | |
| parent | 02e42f0650a64f29e8e21f7ba0a8ceb366463585 (diff) | |
| download | upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.tar.gz upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.tar.bz2 upstream-a2d4b5711aa73d14ffbc4f90a7944473b80baecb.zip | |
kernel: bump 5.10 to 5.10.101
Removed upstreamed:
pending-5.10/841-USB-serial-option-add-ZTE-MF286D-modem.patch[1]
bcm27xx/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=7113440a36c741efd7c76e3d70b3634100120cdb
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=21c890ca8eaecea06cabb92be2a53a6f26f56383
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
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.patch | 10 |
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 c6c0c23570..b9ec7af1ae 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); -@@ -869,6 +907,8 @@ static int bcm_sf2_sw_resume(struct dsa_ +@@ -872,6 +910,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; -@@ -1140,6 +1180,7 @@ struct bcm_sf2_of_data { +@@ -1143,6 +1183,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[] = { -@@ -1164,6 +1205,7 @@ static const struct bcm_sf2_of_data bcm_ +@@ -1167,6 +1208,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 */ -@@ -1274,6 +1316,7 @@ static int bcm_sf2_sw_probe(struct platf +@@ -1277,6 +1319,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"); -@@ -1347,6 +1390,8 @@ static int bcm_sf2_sw_probe(struct platf +@@ -1350,6 +1393,8 @@ static int bcm_sf2_sw_probe(struct platf goto out_clk_mdiv; } |