Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1432951

[PATCH net-next v3 3/7] r8152: add power_cut_en for rtl_ops

Show all headers | View raw

Add power_cut_en() for rtl_ops.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 drivers/net/usb/r8152.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index f51d799..a4f8a01 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -622,6 +622,7 @@ struct r8152 {
 		void (*aldps_enable)(struct r8152 *tp, bool enable);
 		void (*u1u2_enable)(struct r8152 *tp, bool enable);
 		void (*hw_phy_cfg)(struct r8152 *);
+		void (*power_cut_en)(struct r8152 *tp, bool enable);
 	} rtl_ops;
 
 	int intr_interval;
@@ -2391,6 +2392,13 @@ static void r8153_power_cut_en(struct r8152 *tp, bool enable)
 	else
 		ocp_data &= ~(PWR_EN | PHASE2_EN);
 	ocp_write_word(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data);
+}
+
+static void r8153A_power_cut_en(struct r8152 *tp, bool enable)
+{
+	u32 ocp_data;
+
+	r8153_power_cut_en(tp, enable);
 
 	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
 	ocp_data &= ~PCUT_STATUS;
@@ -2941,7 +2949,7 @@ static void rtl8153_down(struct r8152 *tp)
 
 	tp->rtl_ops.u1u2_enable(tp, false);
 	r8153_u2p3en(tp, false);
-	r8153_power_cut_en(tp, false);
+	tp->rtl_ops.power_cut_en(tp, false);
 	tp->rtl_ops.aldps_enable(tp, false);
 	r8153_enter_oob(tp);
 	tp->rtl_ops.aldps_enable(tp, true);
@@ -3397,7 +3405,7 @@ static void r8153_init(struct r8152 *tp)
 
 	ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001);
 
-	r8153_power_cut_en(tp, false);
+	r8153A_power_cut_en(tp, false);
 	r8153_u1u2en(tp, true);
 
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
@@ -4122,7 +4130,7 @@ static void rtl8153_unload(struct r8152 *tp)
 	if (test_bit(RTL8152_UNPLUG, &tp->flags))
 		return;
 
-	r8153_power_cut_en(tp, false);
+	tp->rtl_ops.power_cut_en(tp, false);
 }
 
 static int rtl_ops_init(struct r8152 *tp)
@@ -4145,6 +4153,7 @@ static int rtl_ops_init(struct r8152 *tp)
 		ops->aldps_enable	= r8152_aldps_en;
 		ops->u1u2_enable	= r8153_u1u2en;
 		ops->hw_phy_cfg		= r8152b_hw_phy_cfg;
+		ops->power_cut_en	= r8152_power_cut_en;
 		break;
 
 	case RTL_VER_03:
@@ -4163,6 +4172,7 @@ static int rtl_ops_init(struct r8152 *tp)
 		ops->aldps_enable	= r8153_aldps_en;
 		ops->u1u2_enable	= r8153_u1u2en;
 		ops->hw_phy_cfg		= r8153_hw_phy_cfg;
+		ops->power_cut_en	= r8153A_power_cut_en;
 		break;
 
 	default:
-- 
2.4.11

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 0/6] r8152: support new chips Hayes Wang <hayeswang@realtek.com> - 2016-06-27 08:10 +0200
  [PATCH net-next 3/6] r8152: add power_cut_en for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-27 08:10 +0200
  [PATCH net-next 5/6] r8152: support RTL8153B Hayes Wang <hayeswang@realtek.com> - 2016-06-27 08:10 +0200
  [PATCH net-next v2 2/6] r8152: add u1u2_enable for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v2 6/6] r8152: add byte_enable for ocp_read_word function Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v2 4/6] r8152: support the new chip 8050 Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v2 5/6] r8152: support RTL8153B Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v2 1/6] r8152: add aldps_enable for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v2 0/6] r8152: support new chips Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
    [PATCH net-next v2 3/6] r8152: add power_cut_en for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 04:50 +0200
  [PATCH net-next v3 6/7] r8152: support RTL8153B Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:30 +0200
  [PATCH net-next v3 0/7] r8152: support new chips Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:30 +0200
    [PATCH net-next v3 4/7] r8152: add u2p3_enable for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:30 +0200
    [PATCH net-next v3 7/7] r8152: add byte_enable for ocp_read_word function Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:30 +0200
    [PATCH net-next v3 3/7] r8152: add power_cut_en for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:40 +0200
    [PATCH net-next v3 2/7] r8152: add u1u2_enable for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:40 +0200
    [PATCH net-next v3 1/7] r8152: add aldps_enable for rtl_ops Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:40 +0200
    [PATCH net-next v3 5/7] r8152: support the new chip 8050 Hayes Wang <hayeswang@realtek.com> - 2016-06-28 14:40 +0200
    RE: [PATCH net-next v3 0/7] r8152: support new chips Hayes Wang <hayeswang@realtek.com> - 2016-06-29 05:40 +0200

csiph-web