Inter-revision diff: patch 5

Comparing v7 (message) to v4 (message)

--- v7
+++ v4
@@ -10,19 +10,19 @@
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index 3465f2bb6356..aae27fe3e1e1 100644
+index ef21a84a3a55..460881320ebb 100644
 --- a/drivers/net/phy/at803x.c
 +++ b/drivers/net/phy/at803x.c
-@@ -158,6 +158,8 @@
- #define ATH8035_PHY_ID				0x004dd072
- #define AT8030_PHY_ID_MASK			0xffffffef
+@@ -156,6 +156,8 @@
+ #define QCA8337_PHY_ID				0x004dd036
+ #define QCA8K_PHY_ID_MASK			0xffffffff
  
 +#define QCA8081_PHY_ID				0x004dd101
 +
- #define QCA8327_A_PHY_ID			0x004dd033
- #define QCA8327_B_PHY_ID			0x004dd034
- #define QCA8337_PHY_ID				0x004dd036
-@@ -173,7 +175,7 @@
+ #define QCA8K_DEVFLAGS_REVISION_MASK		GENMASK(2, 0)
+ 
+ #define AT803X_PAGE_FIBER			0
+@@ -165,7 +167,7 @@
  #define AT803X_KEEP_PLL_ENABLED			BIT(0)
  #define AT803X_DISABLE_SMARTEEE			BIT(1)
  
@@ -31,10 +31,10 @@
  MODULE_AUTHOR("Matus Ujhelyi");
  MODULE_LICENSE("GPL");
  
-@@ -1591,6 +1593,18 @@ static struct phy_driver at803x_driver[] = {
+@@ -1480,6 +1482,18 @@ static struct phy_driver at803x_driver[] = {
  	.get_stats		= at803x_get_stats,
- 	.suspend		= qca83xx_suspend,
- 	.resume			= qca83xx_resume,
+ 	.suspend		= genphy_suspend,
+ 	.resume			= genphy_resume,
 +}, {
 +	/* Qualcomm QCA8081 */
 +	PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
@@ -50,10 +50,10 @@
  }, };
  
  module_phy_driver(at803x_driver);
-@@ -1605,6 +1619,7 @@ static struct mdio_device_id __maybe_unused atheros_tbl[] = {
+@@ -1493,6 +1507,7 @@ static struct mdio_device_id __maybe_unused atheros_tbl[] = {
+ 	{ PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
  	{ PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
  	{ PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
- 	{ PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
 +	{ PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
  	{ }
  };
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help