From: Marc Kleine-Budde <m...@pengutronix.de>

This syncs the known Micrel PHY IDs and register definitions with the
Linux kernel, commit f600bb612b06adf70ccdefbd3294c71275b650c2.

Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
Signed-off-by: Stefan Kerkmann <s.kerkm...@pengutronix.de>
---
 include/linux/micrel_phy.h | 49 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index 8752dbbc61..591bf5b5e8 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -1,26 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * include/linux/micrel_phy.h
  *
  * Micrel PHY IDs
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
  */
 
 #ifndef _MICREL_PHY_H
 #define _MICREL_PHY_H
 
+#define MICREL_OUI             0x0885
+
 #define MICREL_PHY_ID_MASK     0x00fffff0
 
 #define PHY_ID_KSZ8873MLL      0x000e7237
 #define PHY_ID_KSZ9021         0x00221610
+#define PHY_ID_KSZ9021RLRN     0x00221611
 #define PHY_ID_KS8737          0x00221720
 #define PHY_ID_KSZ8021         0x00221555
 #define PHY_ID_KSZ8031         0x00221556
 #define PHY_ID_KSZ8041         0x00221510
+/* undocumented */
+#define PHY_ID_KSZ8041RNLI     0x00221537
 #define PHY_ID_KSZ8051         0x00221550
 /* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */
 #define PHY_ID_KSZ8001         0x0022161A
@@ -28,11 +28,46 @@
 #define PHY_ID_KSZ8081         0x00221560
 #define PHY_ID_KSZ8061         0x00221570
 #define PHY_ID_KSZ9031         0x00221620
+#define PHY_ID_KSZ9131         0x00221640
+#define PHY_ID_LAN8814         0x00221660
+#define PHY_ID_LAN8804         0x00221670
+#define PHY_ID_LAN8841         0x00221650
 
 #define PHY_ID_KSZ886X         0x00221430
 #define PHY_ID_KSZ8863         0x00221435
 
+#define PHY_ID_KSZ87XX         0x00221550
+
+#define        PHY_ID_KSZ9477          0x00221631
+
 /* struct phy_device dev_flags definitions */
-#define MICREL_PHY_50MHZ_CLK   0x00000001
+#define MICREL_PHY_50MHZ_CLK   BIT(0)
+#define MICREL_PHY_FXEN                BIT(1)
+#define MICREL_KSZ8_P1_ERRATA  BIT(2)
+#define MICREL_NO_EEE          BIT(3)
+
+#define MICREL_KSZ9021_EXTREG_CTRL     0xB
+#define MICREL_KSZ9021_EXTREG_DATA_WRITE       0xC
+#define MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW 0x104
+#define MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW  0x105
+
+/* Device specific MII_BMCR (Reg 0) bits */
+/* 1 = HP Auto MDI/MDI-X mode, 0 = Microchip Auto MDI/MDI-X mode */
+#define KSZ886X_BMCR_HP_MDIX                   BIT(5)
+/* 1 = Force MDI (transmit on RXP/RXM pins), 0 = Normal operation
+ * (transmit on TXP/TXM pins)
+ */
+#define KSZ886X_BMCR_FORCE_MDI                 BIT(4)
+/* 1 = Disable auto MDI-X */
+#define KSZ886X_BMCR_DISABLE_AUTO_MDIX         BIT(3)
+#define KSZ886X_BMCR_DISABLE_FAR_END_FAULT     BIT(2)
+#define KSZ886X_BMCR_DISABLE_TRANSMIT          BIT(1)
+#define KSZ886X_BMCR_DISABLE_LED               BIT(0)
+
+/* PHY Special Control/Status Register (Reg 31) */
+#define KSZ886X_CTRL_MDIX_STAT                 BIT(4)
+#define KSZ886X_CTRL_FORCE_LINK                        BIT(3)
+#define KSZ886X_CTRL_PWRSAVE                   BIT(2)
+#define KSZ886X_CTRL_REMOTE_LOOPBACK           BIT(1)
 
 #endif /* _MICREL_PHY_H */

-- 
2.39.2


Reply via email to