xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r8152: adjust lpm settings for RTL8153

Browse Source 
Enable lpm after r8153_init() and remove other enable/disable lpm.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
hayeswang
2017-06-09 17:11:39 +08:00
committed by David S. Miller
parent c564b871d5
commit ee4761c16c
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/usb/r8152.c
View File

@@ -2263,7 +2263,6 @@ static int rtl8153_enable(struct r8152 *tp)
if (test_bit(RTL8152_UNPLUG, &tp->flags)) if (test_bit(RTL8152_UNPLUG, &tp->flags))
return -ENODEV; return -ENODEV;
usb_disable_lpm(tp->udev);
set_tx_qlen(tp); set_tx_qlen(tp);
rtl_set_eee_plus(tp); rtl_set_eee_plus(tp);
r8153_set_rx_early_timeout(tp); r8153_set_rx_early_timeout(tp);
@@ -3003,7 +3002,6 @@ static void rtl8153_disable(struct r8152 *tp)
rtl_disable(tp); rtl_disable(tp);
rtl_reset_bmu(tp); rtl_reset_bmu(tp);
r8153_aldps_en(tp, true); r8153_aldps_en(tp, true);
usb_enable_lpm(tp->udev);
} }
static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
@@ -3127,7 +3125,6 @@ static void rtl8153_up(struct r8152 *tp)
r8153_aldps_en(tp, true); r8153_aldps_en(tp, true);
r8153_u2p3en(tp, true); r8153_u2p3en(tp, true);
r8153_u1u2en(tp, true); r8153_u1u2en(tp, true);
usb_enable_lpm(tp->udev);
} }
static void rtl8153_down(struct r8152 *tp) static void rtl8153_down(struct r8152 *tp)
@@ -3457,7 +3454,6 @@ static void r8153_init(struct r8152 *tp)
data = r8153_phy_status(tp, PHY_STAT_LAN_ON); data = r8153_phy_status(tp, PHY_STAT_LAN_ON);
usb_disable_lpm(tp->udev);
r8153_u2p3en(tp, false); r8153_u2p3en(tp, false);
if (tp->version == RTL_VER_04) { if (tp->version == RTL_VER_04) {
@@ -3517,6 +3513,7 @@ static void r8153_init(struct r8152 *tp)
r8153_power_cut_en(tp, false); r8153_power_cut_en(tp, false);
r8153_u1u2en(tp, true); r8153_u1u2en(tp, true);
usb_enable_lpm(tp->udev);
/* MAC clock speed down */ /* MAC clock speed down */
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0); ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);