Commit ee4761c1 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: adjust lpm settings for RTL8153 



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

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c564b871

drivers/net/usb/r8152.c

+1 −4
Original line number Diff line number Diff line
@@ -2263,7 +2263,6 @@ static int rtl8153_enable(struct r8152 *tp) 
	if (test_bit(RTL8152_UNPLUG, &tp->flags))

		return -ENODEV;



	usb_disable_lpm(tp->udev);

	set_tx_qlen(tp);

	rtl_set_eee_plus(tp);

	r8153_set_rx_early_timeout(tp);
@@ -3003,7 +3002,6 @@ static void rtl8153_disable(struct r8152 *tp) 
	rtl_disable(tp);

	rtl_reset_bmu(tp);

	r8153_aldps_en(tp, true);

	usb_enable_lpm(tp->udev);

}



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_u2p3en(tp, true);

	r8153_u1u2en(tp, true);

	usb_enable_lpm(tp->udev);

}



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);



	usb_disable_lpm(tp->udev);

	r8153_u2p3en(tp, false);



	if (tp->version == RTL_VER_04) {
@@ -3517,6 +3513,7 @@ static void r8153_init(struct r8152 *tp) 


	r8153_power_cut_en(tp, false);

	r8153_u1u2en(tp, true);

	usb_enable_lpm(tp->udev);



	/* MAC clock speed down */

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);