diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-09-24 19:01:52 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-09-24 19:01:52 +0200 |
| commit | 35985454a6032bfac0d29b9976d856a89580c01c (patch) | |
| tree | 2bcb0dcde8818a0a98c7c571292ec89ee050c5bb /target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch | |
| parent | 92a0dd2447bda9a6d5440f4a94d9b617406e3f76 (diff) | |
| download | upstream-35985454a6032bfac0d29b9976d856a89580c01c.tar.gz upstream-35985454a6032bfac0d29b9976d856a89580c01c.tar.bz2 upstream-35985454a6032bfac0d29b9976d856a89580c01c.zip | |
kernel: bump 5.10 to 5.10.196
Removed because already in upstream:
target/linux/bcm53xx/patches-5.10/030-v5.11-0002-ARM-dts-BCM5301X-Harmonize-EHCI-OHCI-DT-nodes-name.patch
target/linux/bcm53xx/patches-5.10/033-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch
target/linux/bcm53xx/patches-5.10/040-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch
target/linux/bcm53xx/patches-5.10/040-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch
target/linux/bcm53xx/patches-5.10/040-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch
target/linux/bcm53xx/patches-5.10/040-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch
All other patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch b/target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch index 8be838fd4e..8633b7cd95 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0546-r8152-replace-several-functions-about-phy-patch-requ.patch @@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -3446,59 +3446,76 @@ static void rtl_clear_bp(struct r8152 *t +@@ -3449,59 +3449,76 @@ static void rtl_clear_bp(struct r8152 *t ocp_write_word(tp, type, PLA_BP_BA, 0); } @@ -127,7 +127,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, tp->ocp_base); -@@ -3983,7 +4000,7 @@ static void rtl8152_fw_mac_apply(struct +@@ -3986,7 +4003,7 @@ static void rtl8152_fw_mac_apply(struct dev_dbg(&tp->intf->dev, "successfully applied %s\n", mac->info); } @@ -136,7 +136,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> { struct rtl_fw *rtl_fw = &tp->rtl_fw; const struct firmware *fw; -@@ -4014,12 +4031,11 @@ static void rtl8152_apply_firmware(struc +@@ -4017,12 +4034,11 @@ static void rtl8152_apply_firmware(struc case RTL_FW_PHY_START: key = (struct fw_phy_patch_key *)block; key_addr = __le16_to_cpu(key->key_reg); @@ -151,7 +151,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> break; case RTL_FW_PHY_NC: rtl8152_fw_phy_nc_apply(tp, (struct fw_phy_nc *)block); -@@ -4224,7 +4240,7 @@ static void rtl8152_disable(struct r8152 +@@ -4227,7 +4243,7 @@ static void rtl8152_disable(struct r8152 static void r8152b_hw_phy_cfg(struct r8152 *tp) { @@ -160,7 +160,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> rtl_eee_enable(tp, tp->eee_en); r8152_aldps_en(tp, true); r8152b_enable_fc(tp); -@@ -4506,7 +4522,7 @@ static void r8153_hw_phy_cfg(struct r815 +@@ -4509,7 +4525,7 @@ static void r8153_hw_phy_cfg(struct r815 /* disable EEE before updating the PHY parameters */ rtl_eee_enable(tp, false); @@ -169,7 +169,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (tp->version == RTL_VER_03) { data = ocp_reg_read(tp, OCP_EEE_CFG); -@@ -4580,7 +4596,7 @@ static void r8153b_hw_phy_cfg(struct r81 +@@ -4583,7 +4599,7 @@ static void r8153b_hw_phy_cfg(struct r81 /* disable EEE before updating the PHY parameters */ rtl_eee_enable(tp, false); @@ -178,7 +178,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); -@@ -4621,7 +4637,7 @@ static void r8153b_hw_phy_cfg(struct r81 +@@ -4624,7 +4640,7 @@ static void r8153b_hw_phy_cfg(struct r81 ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); /* Advnace EEE */ @@ -187,7 +187,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> data = ocp_reg_read(tp, OCP_POWER_CFG); data |= EEE_CLKDIV_EN; ocp_reg_write(tp, OCP_POWER_CFG, data); -@@ -4638,7 +4654,7 @@ static void r8153b_hw_phy_cfg(struct r81 +@@ -4641,7 +4657,7 @@ static void r8153b_hw_phy_cfg(struct r81 ocp_reg_write(tp, OCP_SYSCLK_CFG, clk_div_expo(5)); tp->ups_info._250m_ckdiv = true; |