diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-11-02 21:05:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 14:24:07 +0100 |
| commit | 4b26ba4155db8403beb5de42bcff5bd04800a67f (patch) | |
| tree | c2b6ff9d8558964294a449d1f78bfbc5fbc07199 /target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch | |
| parent | e37dffbf3583e8f18ae197daba662ca157d99062 (diff) | |
| download | upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.tar.gz upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.tar.bz2 upstream-4b26ba4155db8403beb5de42bcff5bd04800a67f.zip | |
kernel: bump 5.10 to 5.10.77
Deleted (upstreamed):
bcm53xx/patches-5.10/081-v5.15-Revert-pinctrl-bcm-ns-support-updated-DT-binding-as-.patch [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=01c2881bb0e0a71b87ca425e1b763ac13855aa7e
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch b/target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch index 9d12cb9761..b28e89a43f 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0547-r8152-adjust-the-flow-of-power-cut-for-RTL8153B.patch @@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -1371,6 +1371,10 @@ void write_mii_word(struct net_device *n +@@ -1372,6 +1372,10 @@ void write_mii_word(struct net_device *n static int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags); @@ -31,7 +31,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static int rtl8152_set_mac_address(struct net_device *netdev, void *p) { struct r8152 *tp = netdev_priv(netdev); -@@ -3182,8 +3186,6 @@ static void r8153b_ups_en(struct r8152 * +@@ -3183,8 +3187,6 @@ static void r8153b_ups_en(struct r8152 * ocp_data |= BIT(0); ocp_write_byte(tp, MCU_TYPE_USB, 0xcfff, ocp_data); } else { @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ocp_data &= ~(UPS_EN | USP_PREWAKE); ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); -@@ -3191,31 +3193,20 @@ static void r8153b_ups_en(struct r8152 * +@@ -3192,31 +3194,20 @@ static void r8153b_ups_en(struct r8152 * ocp_data &= ~BIT(0); ocp_write_byte(tp, MCU_TYPE_USB, 0xcfff, ocp_data); @@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } } } -@@ -4587,13 +4578,37 @@ static void r8153b_hw_phy_cfg(struct r81 +@@ -4588,13 +4579,37 @@ static void r8153b_hw_phy_cfg(struct r81 u32 ocp_data; u16 data; @@ -122,7 +122,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); -@@ -5522,9 +5537,6 @@ static void r8153b_init(struct r8152 *tp +@@ -5543,9 +5558,6 @@ static void r8153b_init(struct r8152 *tp /* MSC timer = 0xfff * 8ms = 32760 ms */ ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); |