mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From 6f2f971a88aa929add4db7c0060d97d5b68c7dd1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||
|
|
Date: Sun, 3 Sep 2017 13:42:51 -0600
|
||
|
|
Subject: [PATCH 9/9] Revert "net: phy: Do not perform software reset for
|
||
|
|
Generic PHY"
|
||
|
|
|
||
|
|
This reverts commit aa3a735de9c9999da16b189424ca000a5bae5244.
|
||
|
|
---
|
||
|
|
drivers/net/phy/phy_device.c | 2 +-
|
||
|
|
include/linux/phy.h | 4 ----
|
||
|
|
2 files changed, 1 insertion(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
|
||
|
|
index a1c0d6986148..9a648fdfbf19 100644
|
||
|
|
--- a/drivers/net/phy/phy_device.c
|
||
|
|
+++ b/drivers/net/phy/phy_device.c
|
||
|
|
@@ -1343,7 +1343,7 @@ static struct phy_driver genphy_driver[] = {
|
||
|
|
.phy_id = 0xffffffff,
|
||
|
|
.phy_id_mask = 0xffffffff,
|
||
|
|
.name = "Generic PHY",
|
||
|
|
- .soft_reset = genphy_no_soft_reset,
|
||
|
|
+ .soft_reset = genphy_soft_reset,
|
||
|
|
.config_init = genphy_config_init,
|
||
|
|
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
|
||
|
|
SUPPORTED_AUI | SUPPORTED_FIBRE |
|
||
|
|
diff --git a/include/linux/phy.h b/include/linux/phy.h
|
||
|
|
index fbdacd1278e3..d090cfcaa167 100644
|
||
|
|
--- a/include/linux/phy.h
|
||
|
|
+++ b/include/linux/phy.h
|
||
|
|
@@ -737,10 +737,6 @@ int genphy_read_status(struct phy_device *phydev);
|
||
|
|
int genphy_suspend(struct phy_device *phydev);
|
||
|
|
int genphy_resume(struct phy_device *phydev);
|
||
|
|
int genphy_soft_reset(struct phy_device *phydev);
|
||
|
|
-static inline int genphy_no_soft_reset(struct phy_device *phydev)
|
||
|
|
-{
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
void phy_driver_unregister(struct phy_driver *drv);
|
||
|
|
void phy_drivers_unregister(struct phy_driver *drv, int n);
|
||
|
|
int phy_driver_register(struct phy_driver *new_driver);
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|