]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net: phy: realtek: add rtl8211e driver
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>
Wed, 23 Jan 2013 00:30:03 +0000 (00:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2013 23:34:53 +0000 (18:34 -0500)
This patch adds the minimal driver to manage the
Realtek RTL8211E 10/100/1000 Transceivers.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/realtek.c

index 72f93470ea351315d146c670ab7322f0331d342b..8e7af8354342c9ce6440e3131aad536fbe385c87 100644 (file)
@@ -23,6 +23,8 @@
 #define RTL821x_INER_INIT      0x6400
 #define RTL821x_INSR           0x13
 
+#define        RTL8211E_INER_LINK_STAT 0x10
+
 MODULE_DESCRIPTION("Realtek PHY driver");
 MODULE_AUTHOR("Johnson Leung");
 MODULE_LICENSE("GPL");
@@ -36,7 +38,7 @@ static int rtl821x_ack_interrupt(struct phy_device *phydev)
        return (err < 0) ? err : 0;
 }
 
-static int rtl821x_config_intr(struct phy_device *phydev)
+static int rtl8211b_config_intr(struct phy_device *phydev)
 {
        int err;
 
@@ -49,28 +51,63 @@ static int rtl821x_config_intr(struct phy_device *phydev)
        return err;
 }
 
+static int rtl8211e_config_intr(struct phy_device *phydev)
+{
+       int err;
+
+       if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+               err = phy_write(phydev, RTL821x_INER,
+                               RTL8211E_INER_LINK_STAT);
+       else
+               err = phy_write(phydev, RTL821x_INER, 0);
+
+       return err;
+}
+
 /* RTL8211B */
-static struct phy_driver rtl821x_driver = {
+static struct phy_driver rtl8211b_driver = {
        .phy_id         = 0x001cc912,
-       .name           = "RTL821x Gigabit Ethernet",
+       .name           = "RTL8211B Gigabit Ethernet",
        .phy_id_mask    = 0x001fffff,
        .features       = PHY_GBIT_FEATURES,
        .flags          = PHY_HAS_INTERRUPT,
        .config_aneg    = &genphy_config_aneg,
        .read_status    = &genphy_read_status,
        .ack_interrupt  = &rtl821x_ack_interrupt,
-       .config_intr    = &rtl821x_config_intr,
+       .config_intr    = &rtl8211b_config_intr,
+       .driver         = { .owner = THIS_MODULE,},
+};
+
+/* RTL8211E */
+static struct phy_driver rtl8211e_driver = {
+       .phy_id         = 0x001cc915,
+       .name           = "RTL8211E Gigabit Ethernet",
+       .phy_id_mask    = 0x001fffff,
+       .features       = PHY_GBIT_FEATURES,
+       .flags          = PHY_HAS_INTERRUPT,
+       .config_aneg    = &genphy_config_aneg,
+       .read_status    = &genphy_read_status,
+       .ack_interrupt  = &rtl821x_ack_interrupt,
+       .config_intr    = &rtl8211e_config_intr,
+       .suspend        = genphy_suspend,
+       .resume         = genphy_resume,
        .driver         = { .owner = THIS_MODULE,},
 };
 
 static int __init realtek_init(void)
 {
-       return phy_driver_register(&rtl821x_driver);
+       int ret;
+
+       ret = phy_driver_register(&rtl8211b_driver);
+       if (ret < 0)
+               return -ENODEV;
+       return phy_driver_register(&rtl8211e_driver);
 }
 
 static void __exit realtek_exit(void)
 {
-       phy_driver_unregister(&rtl821x_driver);
+       phy_driver_unregister(&rtl8211b_driver);
+       phy_driver_unregister(&rtl8211e_driver);
 }
 
 module_init(realtek_init);
@@ -78,6 +115,7 @@ module_exit(realtek_exit);
 
 static struct mdio_device_id __maybe_unused realtek_tbl[] = {
        { 0x001cc912, 0x001fffff },
+       { 0x001cc915, 0x001fffff },
        { }
 };