From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
<linux-usb@vger.kernel.org>, Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net-next v2 3/6] r8152: add power_cut_en for rtl_ops
Date: Tue, 28 Jun 2016 10:45:50 +0800 [thread overview]
Message-ID: <1394712342-15778-194-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-191-Taiwan-albertk@realtek.com>
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
next prev parent reply other threads:[~2016-06-28 2:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 5:07 [PATCH net-next 0/6] r8152: support new chips Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 1/6] r8152: add aldps_enable for rtl_ops Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 2/6] r8152: add u1u2_enable " Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 3/6] r8152: add power_cut_en " Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 4/6] r8152: support the new chip 8050 Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 5/6] r8152: support RTL8153B Hayes Wang
2016-06-27 5:07 ` [PATCH net-next 6/6] r8152: add byte_enable for ocp_read_word function Hayes Wang
2016-06-27 10:57 ` Sergei Shtylyov
2016-06-28 2:45 ` [PATCH net-next v2 0/6] r8152: support new chips Hayes Wang
2016-06-28 2:45 ` [PATCH net-next v2 1/6] r8152: add aldps_enable for rtl_ops Hayes Wang
2016-06-28 2:45 ` [PATCH net-next v2 2/6] r8152: add u1u2_enable " Hayes Wang
2016-06-28 2:45 ` Hayes Wang [this message]
2016-06-28 2:45 ` [PATCH net-next v2 4/6] r8152: support the new chip 8050 Hayes Wang
2016-06-28 2:45 ` [PATCH net-next v2 5/6] r8152: support RTL8153B Hayes Wang
2016-06-28 2:45 ` [PATCH net-next v2 6/6] r8152: add byte_enable for ocp_read_word function Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 0/7] r8152: support new chips Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 1/7] r8152: add aldps_enable for rtl_ops Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 2/7] r8152: add u1u2_enable " Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 3/7] r8152: add power_cut_en " Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 4/7] r8152: add u2p3_enable " Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 5/7] r8152: support the new chip 8050 Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 6/7] r8152: support RTL8153B Hayes Wang
2016-06-28 12:28 ` [PATCH net-next v3 7/7] r8152: add byte_enable for ocp_read_word function Hayes Wang
2016-06-29 3:34 ` [PATCH net-next v3 0/7] r8152: support new chips Hayes Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394712342-15778-194-Taiwan-albertk@realtek.com \
--to=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).