From: isubramanian@apm.com (Iyappan Subramanian)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 07/12] drivers: net: xgene: Enable MDIO driver
Date: Wed, 20 Jul 2016 23:59:25 -0700 [thread overview]
Message-ID: <1469084370-16781-8-git-send-email-isubramanian@apm.com> (raw)
In-Reply-To: <1469084370-16781-1-git-send-email-isubramanian@apm.com>
This patch enables MDIO driver by,
- Selecting MDIO_XGENE
- Changed open and close to use phy_start and phy_stop
- Changed to use mac_ops->tx(rx)_enable and tx(rx)_disable
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Tested-by: Fushen Chen <fchen@apm.com>
Tested-by: Toan Le <toanle@apm.com>
---
drivers/net/ethernet/apm/xgene/Kconfig | 1 +
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 8 ++++----
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig
index 19e38af..300e3b5 100644
--- a/drivers/net/ethernet/apm/xgene/Kconfig
+++ b/drivers/net/ethernet/apm/xgene/Kconfig
@@ -3,6 +3,7 @@ config NET_XGENE
depends on HAS_DMA
depends on ARCH_XGENE || COMPILE_TEST
select PHYLIB
+ select MDIO_XGENE
help
This is the Ethernet driver for the on-chip ethernet interface on the
APM X-Gene SoC.
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index b8b643f..27a7a1c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -794,13 +794,13 @@ static void xgene_enet_adjust_link(struct net_device *ndev)
if (pdata->phy_speed != phydev->speed) {
pdata->phy_speed = phydev->speed;
mac_ops->set_speed(pdata);
- xgene_gmac_rx_enable(pdata);
- xgene_gmac_tx_enable(pdata);
+ mac_ops->rx_enable(pdata);
+ mac_ops->tx_enable(pdata);
phy_print_status(phydev);
}
} else {
- xgene_gmac_rx_disable(pdata);
- xgene_gmac_tx_disable(pdata);
+ mac_ops->rx_disable(pdata);
+ mac_ops->tx_disable(pdata);
pdata->phy_speed = SPEED_UNKNOWN;
phy_print_status(phydev);
}
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 6398337..d1d6b5e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -739,9 +739,9 @@ static int xgene_enet_open(struct net_device *ndev)
if (ret)
return ret;
- if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
+ if (pdata->phy_dev) {
phy_start(pdata->phy_dev);
- else {
+ } else {
schedule_delayed_work(&pdata->link_work, PHY_POLL_LINK_OFF);
netif_carrier_off(ndev);
}
--
1.9.1
next prev parent reply other threads:[~2016-07-21 6:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 6:59 [PATCH v6 00/12] drivers: net: xgene: Fix module crash and 1G hot-plug Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 01/12] drivers: net: xgene: Separate set_speed from mac_init Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 02/12] drivers: net: xgene: Fix module unload crash - hw resource cleanup Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 03/12] drivers: net: xgene: Fix module unload crash - change sw sequence Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 04/12] drivers: net: xgene: Fix module unload crash - clkrst sequence Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 05/12] drivers: net: phy: xgene: Add MDIO driver Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 06/12] drivers: net: xgene: Add backward compatibility Iyappan Subramanian
2016-07-21 21:52 ` kbuild test robot
2016-07-21 6:59 ` Iyappan Subramanian [this message]
2016-07-21 6:59 ` [PATCH v6 08/12] drivers: net: xgene: Use exported functions Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 09/12] drivers: net: xgene: ethtool: Use phy_ethtool_gset and sset Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 10/12] dtb: xgene: Add MDIO node Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 11/12] Documentation: " Iyappan Subramanian
2016-07-21 22:01 ` Rob Herring
2016-07-21 22:31 ` Iyappan Subramanian
2016-07-21 6:59 ` [PATCH v6 12/12] MAINTAINERS: xgene: Add driver and documentation path Iyappan Subramanian
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=1469084370-16781-8-git-send-email-isubramanian@apm.com \
--to=isubramanian@apm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).