From a2d4b5711aa73d14ffbc4f90a7944473b80baecb Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 16 Feb 2022 09:46:00 -0500 Subject: 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 --- ...t-dsa-bcm_sf2-add-function-finding-RGMII-register.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/bcm4908/patches-5.10/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch') diff --git a/target/linux/bcm4908/patches-5.10/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch b/target/linux/bcm4908/patches-5.10/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch index 52387776b5..132a734ac4 100644 --- a/target/linux/bcm4908/patches-5.10/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch +++ b/target/linux/bcm4908/patches-5.10/075-v5.13-0004-net-dsa-bcm_sf2-add-function-finding-RGMII-register.patch @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); -@@ -693,6 +718,7 @@ static void bcm_sf2_sw_mac_config(struct +@@ -696,6 +721,7 @@ static void bcm_sf2_sw_mac_config(struct { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); u32 id_mode_dis = 0, port_mode; @@ -65,7 +65,7 @@ Signed-off-by: David S. Miller u32 reg; if (port == core_readl(priv, CORE_IMP0_PRT_ID)) -@@ -716,10 +742,12 @@ static void bcm_sf2_sw_mac_config(struct +@@ -719,10 +745,12 @@ static void bcm_sf2_sw_mac_config(struct return; } @@ -79,7 +79,7 @@ Signed-off-by: David S. Miller reg &= ~ID_MODE_DIS; reg &= ~(PORT_MODE_MASK << PORT_MODE_SHIFT); -@@ -727,13 +755,14 @@ static void bcm_sf2_sw_mac_config(struct +@@ -730,13 +758,14 @@ static void bcm_sf2_sw_mac_config(struct if (id_mode_dis) reg |= ID_MODE_DIS; @@ -95,7 +95,7 @@ Signed-off-by: David S. Miller u32 reg; if (!phy_interface_mode_is_rgmii(interface) && -@@ -741,13 +770,15 @@ static void bcm_sf2_sw_mac_link_set(stru +@@ -744,13 +773,15 @@ static void bcm_sf2_sw_mac_link_set(stru interface != PHY_INTERFACE_MODE_REVMII) return; @@ -113,7 +113,7 @@ Signed-off-by: David S. Miller } static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port, -@@ -781,11 +812,15 @@ static void bcm_sf2_sw_mac_link_up(struc +@@ -784,11 +815,15 @@ static void bcm_sf2_sw_mac_link_up(struc { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct ethtool_eee *p = &priv->dev->ports[port].eee; @@ -130,7 +130,7 @@ Signed-off-by: David S. Miller if (priv->type == BCM4908_DEVICE_ID || priv->type == BCM7445_DEVICE_ID) offset = CORE_STS_OVERRIDE_GMIIP_PORT(port); -@@ -796,7 +831,7 @@ static void bcm_sf2_sw_mac_link_up(struc +@@ -799,7 +834,7 @@ static void bcm_sf2_sw_mac_link_up(struc interface == PHY_INTERFACE_MODE_RGMII_TXID || interface == PHY_INTERFACE_MODE_MII || interface == PHY_INTERFACE_MODE_REVMII) { @@ -139,7 +139,7 @@ Signed-off-by: David S. Miller reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN); if (tx_pause) -@@ -804,7 +839,7 @@ static void bcm_sf2_sw_mac_link_up(struc +@@ -807,7 +842,7 @@ static void bcm_sf2_sw_mac_link_up(struc if (rx_pause) reg |= RX_PAUSE_EN; -- cgit v1.2.3