From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mark Rustad <mark.d.rustad@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 14/17] ixgbe: Provide I2C combined on X550EM
Date: Tue, 22 Sep 2015 16:54:33 -0700 [thread overview]
Message-ID: <1442966076-14359-15-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1442966076-14359-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Mark Rustad <mark.d.rustad@intel.com>
Provide I2C combined operations on X550EM, not X550 devices.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 9fe9445..2906f08 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2039,14 +2039,14 @@ static struct ixgbe_phy_operations phy_ops_X550 = {
X550_COMMON_PHY
.init = NULL,
.identify = &ixgbe_identify_phy_generic,
- .read_i2c_combined = &ixgbe_read_i2c_combined_generic,
- .write_i2c_combined = &ixgbe_write_i2c_combined_generic,
};
static struct ixgbe_phy_operations phy_ops_X550EM_x = {
X550_COMMON_PHY
.init = &ixgbe_init_phy_ops_X550em,
.identify = &ixgbe_identify_phy_x550em,
+ .read_i2c_combined = &ixgbe_read_i2c_combined_generic,
+ .write_i2c_combined = &ixgbe_write_i2c_combined_generic,
};
static const u32 ixgbe_mvals_X550[IXGBE_MVALS_IDX_LIMIT] = {
--
2.4.3
next prev parent reply other threads:[~2015-09-22 23:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 23:54 [net-next 00/17][pull request] Intel Wired LAN Driver Updates 2015-09-22 Jeff Kirsher
2015-09-22 23:54 ` [net-next 01/17] fm10k: remove comment about rtnl_lock around mbx operations Jeff Kirsher
2015-09-22 23:54 ` [net-next 02/17] ixgbe: Add SFP+ detection for X550 hardware Jeff Kirsher
2015-09-22 23:54 ` [net-next 03/17] ixgbe: Add fdir support for SCTP on X550 Jeff Kirsher
2015-09-22 23:54 ` [net-next 04/17] fm10k: drop transmitted messages in Tx FIFO as part of reset_work Jeff Kirsher
2015-09-22 23:54 ` [net-next 05/17] fm10k: create "correct" header for the remote end on connect Jeff Kirsher
2015-09-22 23:54 ` [net-next 06/17] fm10k: TRIVIAL remove unnecessary comma Jeff Kirsher
2015-09-22 23:54 ` [net-next 07/17] fm10k: add support for extra debug statistics Jeff Kirsher
2015-09-22 23:54 ` [net-next 08/17] e1000: remove dead e1000_init_eeprom_params calls Jeff Kirsher
2015-09-22 23:54 ` [net-next 09/17] igbvf: Enable TSO for stacked VLAN Jeff Kirsher
2015-09-22 23:54 ` [net-next 10/17] e1000e: " Jeff Kirsher
2015-09-22 23:54 ` [net-next 11/17] ixgbevf: Enables " Jeff Kirsher
2015-09-22 23:54 ` [net-next 12/17] ixgbe: Accept SFP not present errors on all devices Jeff Kirsher
2015-09-22 23:54 ` [net-next 13/17] ixgbe: Add X550EM support for SFP insertion interrupt Jeff Kirsher
2015-09-22 23:54 ` Jeff Kirsher [this message]
2015-09-22 23:54 ` [net-next 15/17] ixgbe: Provide unlocked I2C methods Jeff Kirsher
2015-09-22 23:54 ` [net-next 16/17] ixgbe: Set lan_id before first I2C eeprom access Jeff Kirsher
2015-09-22 23:54 ` [net-next 17/17] ixgbe: Enable bit-banging mode on X550 Jeff Kirsher
2015-09-23 21:52 ` [net-next 00/17][pull request] Intel Wired LAN Driver Updates 2015-09-22 David Miller
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=1442966076-14359-15-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=mark.d.rustad@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.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).